diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_1.cdl b/cells/a211o/sky130_fd_sc_hdll__a211o_1.cdl
index 98fa239..d6839f4 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_1.cdl
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a211o_1 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a211o_1
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_1.netlist.tsv b/cells/a211o/sky130_fd_sc_hdll__a211o_1.netlist.tsv
index 581ad73..e6dc705 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_1.netlist.tsv
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__a211o_1	A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_1.spice b/cells/a211o/sky130_fd_sc_hdll__a211o_1.spice
index 7f1acf3..193cba8 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_1.spice
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__a211o_1 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_80_21# C1 a_546_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.75e+11p pd=2.55e+06u as=3.5e+11p ps=2.7e+06u
-M1001 VGND B1 a_80_21# VNB nshort w=650000u l=150000u
-+  ad=8.32e+11p pd=5.16e+06u as=3.8675e+11p ps=3.79e+06u
-M1002 VPWR a_80_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=7.55e+11p pd=5.51e+06u as=2.75e+11p ps=2.55e+06u
-M1003 VGND a_80_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.7225e+11p ps=1.83e+06u
-M1004 a_546_297# B1 a_227_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.75e+11p ps=5.15e+06u
-M1005 VPWR A2 a_227_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_80_21# A1 a_320_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.315e+11p ps=2.32e+06u
-M1007 a_320_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_227_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_80_21# C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_80_21# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_546_297# C1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_227_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND A2 a_320_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VGND C1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VPWR A1 a_227_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_227_297# B1 a_546_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_320_47# A1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_2.cdl b/cells/a211o/sky130_fd_sc_hdll__a211o_2.cdl
index 825159b..60305ca 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_2.cdl
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a211o_2 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a211o_2
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_2.netlist.tsv b/cells/a211o/sky130_fd_sc_hdll__a211o_2.netlist.tsv
index 710528e..d38284a 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_2.netlist.tsv
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__a211o_2	A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_2.spice b/cells/a211o/sky130_fd_sc_hdll__a211o_2.spice
index 823824a..b4a645f 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_2.spice
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__a211o_2 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=9.4e+11p pd=7.88e+06u as=2.9e+11p ps=2.58e+06u
-M1001 a_643_297# B1 a_319_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.3e+11p pd=2.46e+06u as=6.8e+11p ps=5.36e+06u
-M1002 VGND B1 a_79_21# VNB nshort w=650000u l=150000u
-+  ad=1.027e+12p pd=7.06e+06u as=4.5825e+11p ps=4.01e+06u
-M1003 a_421_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.5925e+11p pd=1.79e+06u as=0p ps=0u
-M1004 a_319_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_79_21# C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A2 a_319_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.145e+11p ps=1.96e+06u
-M1009 a_79_21# C1 a_643_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1010 a_79_21# A1 a_421_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A2 a_421_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VPWR A1 a_319_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VPWR a_79_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_421_47# A1 a_79_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_79_21# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VGND C1 a_79_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_319_297# B1 a_643_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 X a_79_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VGND a_79_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_643_297# C1 a_79_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_319_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 X a_79_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_4.cdl b/cells/a211o/sky130_fd_sc_hdll__a211o_4.cdl
index 620658e..8d4e13d 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_4.cdl
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a211o_4 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 y C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a211o_4
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_4.netlist.tsv b/cells/a211o/sky130_fd_sc_hdll__a211o_4.netlist.tsv
index 8c01132..bbe3549 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_4.netlist.tsv
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__a211o_4	A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_4.spice b/cells/a211o/sky130_fd_sc_hdll__a211o_4.spice
index 59ee5ff..2a17006 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_4.spice
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__a211o_4 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 VPWR A2 a_523_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.55e+12p pd=1.31e+07u as=1.25e+12p ps=1.05e+07u
-M1001 X a_79_204# VGND VNB nshort w=650000u l=150000u
-+  ad=4.7125e+11p pd=4.05e+06u as=1.43325e+12p ps=1.221e+07u
-M1002 a_1051_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.82e+11p pd=1.86e+06u as=0p ps=0u
-M1003 VPWR a_79_204# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=6e+11p ps=5.2e+06u
-M1004 VGND a_79_204# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_79_204# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_79_204# C1 a_613_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=3e+11p ps=2.6e+06u
-M1007 a_79_204# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=7.41e+11p pd=6.18e+06u as=0p ps=0u
-M1008 VPWR A1 a_523_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_79_204# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_79_204# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_79_204# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_79_204# C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND B1 a_79_204# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1243_47# A1 a_79_204# VNB nshort w=650000u l=150000u
-+  ad=1.82e+11p pd=1.86e+06u as=0p ps=0u
-M1015 a_523_297# B1 a_805_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.4e+11p ps=2.68e+06u
-M1016 a_79_204# A1 a_1051_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_613_297# B1 a_523_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_523_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A2 a_1243_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_79_204# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_523_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_805_297# C1 a_79_204# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND C1 a_79_204# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_79_204# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VPWR a_79_204# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VGND a_79_204# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_805_297# B1 a_523_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_79_204# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_1243_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VGND C1 a_79_204# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND B1 a_79_204# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_79_204# C1 a_805_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR A1 a_523_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_523_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VPWR A2 a_523_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 X a_79_204# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_79_204# A1 a_1243_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VGND A2 a_1051_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_523_297# B1 a_613_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_613_297# C1 a_79_204# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 X a_79_204# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VPWR a_79_204# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_523_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VGND a_79_204# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 X a_79_204# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_79_204# C1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 a_1051_47# A1 a_79_204# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.cdl b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.cdl
index 4e474ee..b8faa79 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.cdl
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a211oi_1 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 Y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 Y C1 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
-MMNA0 Y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a211oi_1
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.netlist.tsv b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.netlist.tsv
index f1ab6c9..37bba95 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.netlist.tsv
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.spice b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.spice
index 27d90e0..f1573a8 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.spice
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__a211oi_1 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.05e+11p pd=2.61e+06u as=6.45e+11p ps=5.29e+06u
-M1001 Y C1 a_325_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.6e+11p pd=2.72e+06u as=3.15e+11p ps=2.63e+06u
-M1002 a_123_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.8525e+11p pd=1.87e+06u as=4.3875e+11p ps=3.95e+06u
-M1003 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.1025e+11p ps=4.17e+06u
-M1005 a_325_297# B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A1 a_123_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_325_297# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND A2 a_123_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_123_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR A1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_27_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_27_297# B1 a_325_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.cdl b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.cdl
index 3f754c1..77e8349 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.cdl
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a211oi_2 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 Y C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 Y C1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a211oi_2
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.netlist.tsv b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.netlist.tsv
index 8112273..01a07aa 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.netlist.tsv
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.spice b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.spice
index 6b49b29..4ecb943 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.spice
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__a211oi_2 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 VPWR A2 a_320_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.5e+11p pd=7.7e+06u as=9e+11p ps=7.8e+06u
-M1001 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=7.085e+11p pd=6.08e+06u as=8.06e+11p ps=7.68e+06u
-M1002 a_525_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=5.265e+11p pd=5.52e+06u as=0p ps=0u
-M1003 a_320_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y C1 a_37_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=8.5e+11p ps=7.7e+06u
-M1005 a_320_297# B1 a_37_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A1 a_525_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_320_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2 a_525_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_525_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_37_297# C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_37_297# B1 a_320_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A1 a_320_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_37_297# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR A1 a_320_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VGND A2 a_525_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y A1 a_525_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_525_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 Y C1 a_37_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_37_297# B1 a_320_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_320_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_320_297# B1 a_37_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_525_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_320_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VPWR A2 a_320_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.cdl b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.cdl
index dea5f51..49a1bb7 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.cdl
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a211oi_4 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 Y C1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 Y C1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a211oi_4
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.netlist.tsv b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.netlist.tsv
index ca4a0eb..8de2f6c 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.netlist.tsv
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.spice b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.spice
index 2b87277..9cd27ae 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.spice
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hdll__a211oi_4 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.99e+12p pd=1.798e+07u as=1.16e+12p ps=1.032e+07u
-M1001 VGND C1 Y VNB nshort w=650000u l=150000u
-+  ad=1.404e+12p pd=1.342e+07u as=1.365e+12p ps=1.2e+07u
-M1002 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A2 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.995e+11p ps=7.66e+06u
-M1004 Y C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_869_297# C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=5.9e+11p pd=5.18e+06u as=6.2e+11p ps=5.24e+06u
-M1007 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1057_297# B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.2e+11p pd=2.64e+06u as=0p ps=0u
-M1010 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A2 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_119_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C1 a_1057_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_297# B1 a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y C1 a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_119_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_869_297# B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1449_297# C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=3.3e+11p pd=2.66e+06u as=0p ps=0u
-M1027 a_27_297# B1 a_1449_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_119_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y A1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_119_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_1449_297# B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VGND A2 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_119_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_27_297# B1 a_869_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_27_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VPWR A2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 Y A1 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 Y A1 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VPWR A1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_119_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_27_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 Y C1 a_869_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_27_297# B1 a_1057_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 a_869_297# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_27_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VGND A2 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 a_119_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 a_1057_297# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 Y C1 a_1449_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 VPWR A2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 a_869_297# B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 VPWR A1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 a_119_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.cdl b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.cdl
index 348472c..d1154dc 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.cdl
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21bo_1 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y 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
-MMNA0 y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nshort m=1 w=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.65 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21bo_1
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.netlist.tsv b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.netlist.tsv
index bbcb950..f8edf28 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.netlist.tsv
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__a21bo_1	A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.spice b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.spice
index 175e2e6..4c81d02 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.spice
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__a21bo_1 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 a_326_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.65e+11p pd=5.13e+06u as=6.834e+11p ps=6.52e+06u
-M1001 a_412_47# A1 a_235_297# VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=1.755e+11p ps=1.84e+06u
-M1002 VPWR B1_N a_27_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1003 a_235_297# a_27_413# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=9.0705e+11p ps=5.49e+06u
-M1004 VGND B1_N a_27_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.323e+11p ps=1.47e+06u
-M1005 X a_235_297# VGND VNB nshort w=650000u l=150000u
-+  ad=2.4375e+11p pd=2.05e+06u as=0p ps=0u
-M1006 VGND A2 a_412_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A1 a_326_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_326_297# a_27_413# a_235_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.55e+06u
-M1009 X a_235_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.85e+11p pd=2.77e+06u as=0p ps=0u
+X0 a_27_413# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 a_412_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VPWR a_235_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_235_297# a_27_413# a_326_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND a_27_413# a_235_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_27_413# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_235_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_326_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR A2 a_326_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_235_297# A1 a_412_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.cdl b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.cdl
index 5de53f1..2234263 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.cdl
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21bo_2 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nshort m=1 w=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.65 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21bo_2
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.netlist.tsv b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.netlist.tsv
index 143bce1..a686b80 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.netlist.tsv
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__a21bo_2	A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.spice b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.spice
index ca552c9..c7c690d 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.spice
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__a21bo_2 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 a_621_47# A1 a_79_21# VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=2.145e+11p ps=1.96e+06u
-M1001 VPWR A1 a_523_297# VPB phighvt w=1e+06u l=180000u
-+  ad=9.372e+11p pd=8.18e+06u as=5.7e+11p ps=5.14e+06u
-M1002 VGND A2 a_621_47# VNB nshort w=650000u l=150000u
-+  ad=7.8875e+11p pd=7.68e+06u as=0p ps=0u
-M1003 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1004 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.47e+11p ps=2.06e+06u
-M1005 a_523_297# a_317_93# a_79_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1006 a_317_93# B1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1007 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_317_93# B1_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1009 a_523_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_79_21# a_317_93# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_79_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_621_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_79_21# a_317_93# a_523_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_523_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_79_21# A1 a_621_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VGND a_317_93# a_79_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VGND B1_N a_317_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_79_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 X a_79_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 X a_79_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VPWR B1_N a_317_93# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X11 VPWR A2 a_523_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.cdl b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.cdl
index 5255765..090f818 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.cdl
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21bo_4 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21bo_4
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.netlist.tsv b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.netlist.tsv
index dacda1f..edc5e6b 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.netlist.tsv
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__a21bo_4	A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.spice b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.spice
index a30afbe..8cdac9b 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.spice
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_hdll__a21bo_4 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 X a_209_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6e+11p pd=5.2e+06u as=1.47e+12p ps=1.294e+07u
-M1001 X a_209_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.29e+11p pd=3.92e+06u as=1.4235e+12p ps=1.088e+07u
-M1002 VPWR A2 a_647_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.12e+12p ps=1.024e+07u
-M1003 VPWR B1_N a_36_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.55e+06u
-M1004 VGND a_209_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_647_297# a_36_47# a_209_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1006 VPWR a_209_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_209_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_647_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_209_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_36_47# a_209_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.485e+11p ps=3.98e+06u
-M1011 a_1115_47# A1 a_209_21# VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=0p ps=0u
-M1012 VPWR a_209_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND B1_N a_36_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.8275e+11p ps=2.17e+06u
-M1014 VPWR A1 a_647_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A2 a_1115_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_209_21# a_36_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_935_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.495e+11p pd=1.76e+06u as=0p ps=0u
-M1018 X a_209_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_209_21# a_36_47# a_647_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_647_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_209_21# A1 a_935_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_36_47# a_209_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_36_47# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VPWR a_209_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 X a_209_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VPWR A1 a_647_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_1115_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_647_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_935_47# A1 a_209_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_209_21# A1 a_1115_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VGND a_209_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_36_47# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_647_297# a_36_47# a_209_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VPWR A2 a_647_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_209_21# a_36_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_647_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 X a_209_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VGND A2 a_935_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_209_21# a_36_47# a_647_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VGND a_209_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 X a_209_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VPWR a_209_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 X a_209_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.cdl b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.cdl
index 75ac715..3b284be 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.cdl
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21boi_1 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 net40 A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 net40 A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 net40 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 Y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 net40 A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N 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
-MMNA0 Y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nshort m=1 w=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_hdll__a21boi_1
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.netlist.tsv b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.netlist.tsv
index 631bd66..757f534 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.netlist.tsv
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__a21boi_1	A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	net40	A1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	net40	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	net40	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.65	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	net40	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	net40	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	net40	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.65	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_hdll__a21boi_1.spice b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.spice
index f72d863..f1c48a4 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.spice
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__a21boi_1 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 VPWR B1_N a_27_413# VPB phighvt w=420000u l=180000u
-+  ad=5.355e+11p pd=4.23e+06u as=1.155e+11p ps=1.39e+06u
-M1001 VPWR A1 a_338_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.75e+11p ps=5.15e+06u
-M1002 VGND B1_N a_27_413# VNB nshort w=420000u l=150000u
-+  ad=4.345e+11p pd=3.99e+06u as=1.533e+11p ps=1.57e+06u
-M1003 a_434_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=2.665e+11p pd=2.12e+06u as=3.51e+11p ps=2.38e+06u
-M1004 VGND A2 a_434_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y a_27_413# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_338_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_338_297# a_27_413# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.25e+11p ps=2.65e+06u
+X0 a_27_413# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VPWR A2 a_338_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_27_413# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_434_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND a_27_413# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 Y A1 a_434_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y a_27_413# a_338_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_338_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.cdl b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.cdl
index cafec47..94de9cd 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.cdl
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21boi_2 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 net40 A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 net40 A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 net40 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 Y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 net40 A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N 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
-MMNA0 Y A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nshort m=1 w=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_hdll__a21boi_2
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.netlist.tsv b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.netlist.tsv
index 5c5b5fa..d354aa4 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.netlist.tsv
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__a21boi_2	A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	net40	A1	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	net40	A2	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	net40	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	2	0.65	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	net40	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	net40	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	net40	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	2	0.65	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_hdll__a21boi_2.spice b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.spice
index e1761c7..e282817 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.spice
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_hdll__a21boi_2 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 a_228_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2e+12p pd=1.04e+07u as=7.055e+11p ps=6.57e+06u
-M1001 VPWR A2 a_228_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_228_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_228_297# a_61_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1004 Y A1 a_529_47# VNB nshort w=650000u l=150000u
-+  ad=4.225e+11p pd=3.9e+06u as=1.365e+11p ps=1.72e+06u
-M1005 Y a_61_47# a_228_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_61_47# Y VNB nshort w=650000u l=150000u
-+  ad=8.845e+11p pd=6.71e+06u as=0p ps=0u
-M1007 a_61_47# B1_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.155e+11p pd=1.39e+06u as=0p ps=0u
-M1008 VPWR A1 a_228_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_529_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B1_N a_61_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.47e+11p ps=1.54e+06u
-M1011 a_697_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=0p ps=0u
-M1012 Y a_61_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A2 a_697_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_61_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_228_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_228_297# a_61_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VPWR A2 a_228_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND A2 a_529_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 Y a_61_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR A1 a_228_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_228_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_697_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_529_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_61_47# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 Y A1 a_697_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VPWR B1_N a_61_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X13 Y a_61_47# a_228_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.cdl b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.cdl
index 9b857a6..04fa386 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.cdl
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21boi_4 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 net40 A1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 net40 A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 net40 A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 Y B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 net40 A2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N 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
-MMNA0 Y A1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21boi_4
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.netlist.tsv b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.netlist.tsv
index ddfac16..f458fe3 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.netlist.tsv
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__a21boi_4	A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	net40	A1	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	net40	A2	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	net40	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	net40	A1	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	net40	A2	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	net40	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	4	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.spice b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.spice
index 728d86a..21f554b 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.spice
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_hdll__a21boi_4 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 a_724_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=7.8e+11p pd=7.6e+06u as=1.365e+12p ps=1.07e+07u
-M1001 a_724_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=8.905e+11p ps=7.94e+06u
-M1003 VPWR A2 a_227_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.465e+12p pd=1.293e+07u as=2.125e+12p ps=1.825e+07u
-M1004 VGND A2 a_724_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_227_297# a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=6e+11p ps=5.2e+06u
-M1006 a_227_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A1 a_724_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_227_297# a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_724_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR B1_N a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.55e+06u
-M1011 VPWR A2 a_227_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A2 a_724_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_724_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A1 a_227_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B1_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.0225e+11p ps=2.23e+06u
-M1016 Y a_27_47# a_227_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A1 a_227_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A1 a_724_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_227_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y a_27_47# a_227_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_227_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_227_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_724_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 Y a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_724_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 Y a_27_47# a_227_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_227_297# a_27_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y a_27_47# a_227_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND a_27_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VGND A2 a_724_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VGND a_27_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 Y A1 a_724_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_724_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_27_47# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_27_47# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_227_297# a_27_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_227_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VGND A2 a_724_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VPWR A1 a_227_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VPWR A2 a_227_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_227_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 a_227_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR A1 a_227_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 VPWR A2 a_227_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 a_227_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 a_724_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 Y A1 a_724_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_1.cdl b/cells/a21o/sky130_fd_sc_hdll__a21o_1.cdl
index 2c3f229..cbf50ca 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_1.cdl
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21o_1 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21o_1
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_1.netlist.tsv b/cells/a21o/sky130_fd_sc_hdll__a21o_1.netlist.tsv
index 0ecdade..19a45be 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_1.netlist.tsv
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__a21o_1	A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_1.spice b/cells/a21o/sky130_fd_sc_hdll__a21o_1.spice
index 670ec82..194d764 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_1.spice
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__a21o_1 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 VGND a_81_21# X VNB nshort w=650000u l=150000u
-+  ad=7.8325e+11p pd=5.01e+06u as=1.69e+11p ps=1.82e+06u
-M1001 a_81_21# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=2.1775e+11p pd=1.97e+06u as=0p ps=0u
-M1002 VPWR A1 a_317_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.7e+11p pd=5.14e+06u as=5.8e+11p ps=5.16e+06u
-M1003 VPWR a_81_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1004 VGND A2 a_416_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.82e+11p ps=1.86e+06u
-M1005 a_317_297# B1 a_81_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1006 a_317_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_416_47# A1 a_81_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B1 a_81_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 X a_81_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_317_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VPWR A2 a_317_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_81_21# B1 a_317_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_81_21# A1 a_416_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_416_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 X a_81_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_2.cdl b/cells/a21o/sky130_fd_sc_hdll__a21o_2.cdl
index 4da10a0..fff7995 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_2.cdl
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21o_2 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21o_2
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_2.netlist.tsv b/cells/a21o/sky130_fd_sc_hdll__a21o_2.netlist.tsv
index 36cf2fe..5181d67 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_2.netlist.tsv
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__a21o_2	A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_2.spice b/cells/a21o/sky130_fd_sc_hdll__a21o_2.spice
index 1a909e3..a14fcd9 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_2.spice
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__a21o_2 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 a_444_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.7e+11p pd=5.14e+06u as=9.35e+11p ps=7.87e+06u
-M1001 VPWR A1 a_444_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 X a_80_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.5e+11p pd=2.7e+06u as=0p ps=0u
-M1003 X a_80_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.795e+11p pd=2.16e+06u as=8.5475e+11p ps=6.53e+06u
-M1004 a_444_297# B1 a_80_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.25e+11p ps=2.65e+06u
-M1005 VPWR a_80_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_80_21# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=3.185e+11p pd=2.28e+06u as=0p ps=0u
-M1007 VGND a_80_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_532_47# A1 a_80_21# VNB nshort w=650000u l=150000u
-+  ad=2.3725e+11p pd=2.03e+06u as=0p ps=0u
-M1009 VGND A2 a_532_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_80_21# B1 a_444_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_444_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VGND a_80_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR a_80_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND B1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR A2 a_444_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_532_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_80_21# A1 a_532_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_4.cdl b/cells/a21o/sky130_fd_sc_hdll__a21o_4.cdl
index a6c46f9..05d4e46 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_4.cdl
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21o_4 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21o_4
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_4.netlist.tsv b/cells/a21o/sky130_fd_sc_hdll__a21o_4.netlist.tsv
index 0a08fda..0a79d52 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_4.netlist.tsv
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__a21o_4	A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_4.spice b/cells/a21o/sky130_fd_sc_hdll__a21o_4.spice
index 0404fc9..17bae45 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_4.spice
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__a21o_4 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 VGND B1 a_84_21# VNB nshort w=650000u l=150000u
-+  ad=1.365e+12p pd=1.07e+07u as=4.81e+11p ps=4.08e+06u
-M1001 a_523_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.255e+12p pd=1.051e+07u as=1.47e+12p ps=1.294e+07u
-M1002 X a_84_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.29e+11p pd=3.92e+06u as=0p ps=0u
-M1003 VPWR a_84_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=6e+11p ps=5.2e+06u
-M1004 VPWR A2 a_523_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_84_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_84_21# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_801_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.82e+11p pd=1.86e+06u as=0p ps=0u
-M1008 VGND a_84_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_991_47# A1 a_84_21# VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=0p ps=0u
-M1010 VGND A2 a_991_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_523_297# B1 a_84_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1012 VPWR a_84_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_523_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_84_21# B1 a_523_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A1 a_523_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_84_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_84_21# A1 a_801_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_84_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_84_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_523_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND a_84_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VPWR a_84_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_84_21# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_991_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 X a_84_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 X a_84_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND A2 a_801_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 X a_84_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VPWR A2 a_523_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VGND a_84_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_523_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 X a_84_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_801_47# A1 a_84_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VPWR a_84_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VGND B1 a_84_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_84_21# B1 a_523_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_84_21# A1 a_991_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 a_523_297# B1 a_84_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_523_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_6.cdl b/cells/a21o/sky130_fd_sc_hdll__a21o_6.cdl
index 22ecd3e..5f18da1 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_6.cdl
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_6.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21o_6 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21o_6
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_6.netlist.tsv b/cells/a21o/sky130_fd_sc_hdll__a21o_6.netlist.tsv
index 9ccd131..efa6fa2 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_6.netlist.tsv
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_6.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__a21o_6	A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_6.spice b/cells/a21o/sky130_fd_sc_hdll__a21o_6.spice
index 01ad7ea..3c6d4b8 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_6.spice
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_6.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__a21o_6 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 VGND A2 a_297_47# VNB nshort w=650000u l=150000u
-+  ad=1.69e+12p pd=1.3e+07u as=1.69e+11p ps=1.82e+06u
-M1001 X a_213_47# VGND VNB nshort w=650000u l=150000u
-+  ad=5.265e+11p pd=5.52e+06u as=0p ps=0u
-M1002 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.12e+12p pd=1.024e+07u as=1.7e+12p ps=1.54e+07u
-M1003 a_213_47# A1 a_131_47# VNB nshort w=650000u l=150000u
-+  ad=3.51e+11p pd=3.68e+06u as=1.69e+11p ps=1.82e+06u
-M1004 X a_213_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=0p ps=0u
-M1005 X a_213_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_213_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_297_47# A1 a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_297# B1 a_213_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1009 VGND a_213_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_213_47# B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_131_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_213_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_213_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_213_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_213_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_213_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND B1 a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_213_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_213_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_213_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_297# B1 a_213_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR a_213_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_213_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND B1 a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_213_47# A1 a_297_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_27_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 X a_213_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 X a_213_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VPWR A2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_131_47# A1 a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 X a_213_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_27_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VGND A2 a_131_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 X a_213_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 X a_213_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VPWR a_213_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VGND a_213_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_297_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 VPWR A1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 VGND a_213_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 VPWR a_213_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VGND a_213_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_213_47# B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 X a_213_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_8.cdl b/cells/a21o/sky130_fd_sc_hdll__a21o_8.cdl
index 298355c..6d432d3 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_8.cdl
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_8.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21o_8 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21o_8
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_8.netlist.tsv b/cells/a21o/sky130_fd_sc_hdll__a21o_8.netlist.tsv
index 5ea409a..bb6f105 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_8.netlist.tsv
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_8.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__a21o_8	A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_8.spice b/cells/a21o/sky130_fd_sc_hdll__a21o_8.spice
index 0f1e8d6..ef66365 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_8.spice
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_8.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_hdll__a21o_8 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 VGND A2 a_297_47# VNB nshort w=650000u l=150000u
-+  ad=1.9305e+12p pd=1.504e+07u as=1.69e+11p ps=1.82e+06u
-M1001 X a_213_47# VGND VNB nshort w=650000u l=150000u
-+  ad=7.02e+11p pd=7.36e+06u as=0p ps=0u
-M1002 VGND a_213_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.12e+12p pd=1.024e+07u as=1.99e+12p ps=1.798e+07u
-M1004 a_213_47# A1 a_131_47# VNB nshort w=650000u l=150000u
-+  ad=3.51e+11p pd=3.68e+06u as=1.69e+11p ps=1.82e+06u
-M1005 X a_213_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=0p ps=0u
-M1006 X a_213_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_213_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_297_47# A1 a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# B1 a_213_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1010 VGND a_213_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_213_47# B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_213_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_131_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_213_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_213_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_213_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_213_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_213_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_213_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_213_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND B1 a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_213_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_213_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 X a_213_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_297# B1 a_213_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR a_213_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_213_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 X a_213_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND B1 a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_213_47# A1 a_297_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_27_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 X a_213_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 X a_213_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VPWR A2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_131_47# A1 a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 X a_213_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_27_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VGND A2 a_131_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 X a_213_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VPWR a_213_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 X a_213_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 VPWR a_213_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VGND a_213_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 X a_213_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_297_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 VGND a_213_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 VPWR A1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 VGND a_213_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 VPWR a_213_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 VGND a_213_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 a_213_47# B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 X a_213_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.cdl b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.cdl
index 9a0349c..db251fa 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.cdl
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21oi_1 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 Y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 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
-MMNA0 Y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21oi_1
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.netlist.tsv b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.netlist.tsv
index bcfd640..e481d1a 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.netlist.tsv
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.spice b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.spice
index 9718cc2..1ad96d4 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.spice
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hdll__a21oi_1 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 a_121_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=5.75e+11p pd=5.15e+06u as=2.75e+11p ps=2.55e+06u
-M1001 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=4.095e+11p ps=3.86e+06u
-M1002 a_219_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=1.9175e+11p pd=1.89e+06u as=0p ps=0u
-M1003 VPWR A1 a_121_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.15e+11p pd=2.63e+06u as=0p ps=0u
-M1004 a_121_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A2 a_219_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_121_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 Y B1 a_121_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VPWR A2 a_121_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y A1 a_219_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_219_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.cdl b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.cdl
index 19c901f..9df9115 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.cdl
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21oi_2 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 Y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21oi_2
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.netlist.tsv b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.netlist.tsv
index 539df1f..4e981d5 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.netlist.tsv
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.spice b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.spice
index 3a023e2..c20808b 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.spice
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__a21oi_2 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.9e+11p pd=5.18e+06u as=1.25e+12p ps=1.05e+07u
-M1001 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=7.54e+11p pd=6.22e+06u as=4.55e+11p ps=4e+06u
-M1003 a_123_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.82e+11p pd=1.86e+06u as=0p ps=0u
-M1004 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_315_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=1.365e+11p pd=1.72e+06u as=0p ps=0u
-M1006 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_315_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A1 a_123_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1010 Y B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_27_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_315_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND A2 a_123_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 Y B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VPWR A1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y A1 a_315_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_27_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_27_297# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_123_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.cdl b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.cdl
index 99f3ab0..dc3a00b 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.cdl
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21oi_4 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 Y B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21oi_4
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.netlist.tsv b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.netlist.tsv
index 69fd287..6d7f265 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.netlist.tsv
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.spice b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.spice
index bb87041..efd8327 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.spice
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__a21oi_4 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_28_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.21e+12p pd=1.042e+07u as=2.075e+12p ps=1.815e+07u
-M1001 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=1.014e+12p pd=9.62e+06u as=9.23e+11p ps=8.04e+06u
-M1002 VPWR A2 a_28_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A1 a_28_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_502_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=8.255e+11p pd=7.74e+06u as=0p ps=0u
-M1006 Y B1 a_28_297# VPB phighvt w=1e+06u l=180000u
-+  ad=6e+11p pd=5.2e+06u as=0p ps=0u
-M1007 a_28_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_502_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 a_28_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_502_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_28_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A2 a_502_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A1 a_502_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_502_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_28_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_28_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A1 a_502_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_28_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_28_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A2 a_28_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_502_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_502_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_28_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VPWR A1 a_28_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND A2 a_502_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_28_297# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_28_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VPWR A1 a_28_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VPWR A2 a_28_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 Y A1 a_502_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_502_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_502_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_28_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 Y A1 a_502_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VGND A2 a_502_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 Y B1 a_28_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_28_297# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 a_28_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 a_502_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 Y B1 a_28_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 VPWR A2 a_28_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.cdl b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.cdl
index 4c780a1..1b22147 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.cdl
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a221oi_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 pndB B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 Y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 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
-MMPC0 Y C1 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
-MMNA0 Y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a221oi_1
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.netlist.tsv b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.netlist.tsv
index affeab8..0e6a91e 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.netlist.tsv
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.spice b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.spice
index 7175f11..403c4e1 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.spice
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__a221oi_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 a_211_297# B2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=6.4e+11p pd=5.28e+06u as=5.6e+11p ps=5.12e+06u
-M1001 VPWR A2 a_211_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1002 a_225_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.365e+11p pd=1.72e+06u as=4.3225e+11p ps=3.93e+06u
-M1003 Y B1 a_225_47# VNB nshort w=650000u l=150000u
-+  ad=6.045e+11p pd=5.76e+06u as=0p ps=0u
-M1004 VGND A2 a_505_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.47e+11p ps=2.06e+06u
-M1005 a_505_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_117_297# C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1007 a_211_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_117_297# B1 a_211_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_225_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 Y C1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_211_297# B1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_211_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VGND B2 a_225_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_505_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_117_297# B2 a_211_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR A1 a_211_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Y A1 a_505_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.cdl b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.cdl
index 0343f56..8f8f734 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.cdl
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a221oi_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 pndB B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 Y C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 Y C1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a221oi_2
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.netlist.tsv b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.netlist.tsv
index 1f3c1af..47880ef 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.netlist.tsv
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.spice b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.spice
index 1416929..05221aa 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.spice
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__a221oi_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 Y B1 a_413_47# VNB nshort w=650000u l=150000u
-+  ad=6.89e+11p pd=6.02e+06u as=3.835e+11p ps=3.78e+06u
-M1001 a_27_297# B1 a_321_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.13e+12p pd=1.026e+07u as=1.515e+12p ps=1.303e+07u
-M1002 VPWR A2 a_321_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1003 a_805_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=3.835e+11p pd=3.78e+06u as=1.183e+12p ps=8.84e+06u
-M1004 Y C1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1005 a_321_297# B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A1 a_805_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_297# B2 a_321_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_321_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B2 a_413_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_413_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A2 a_805_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A1 a_321_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_805_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_321_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_413_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_297# C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_321_297# B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_321_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y A1 a_805_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_321_297# B2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_27_297# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_805_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VPWR A1 a_321_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VPWR A2 a_321_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_27_297# B2 a_321_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_321_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_413_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_413_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VGND B2 a_413_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_321_297# B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 Y B1 a_413_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 Y C1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_27_297# B1 a_321_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 a_805_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 VGND A2 a_805_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.cdl b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.cdl
index 442705b..c384e5a 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.cdl
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a221oi_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 pndB B2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 Y C1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 Y C1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a221oi_4
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.netlist.tsv b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.netlist.tsv
index 9bf5165..a96936b 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.netlist.tsv
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.spice b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.spice
index 5ea189b..5410439 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.spice
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_hdll__a221oi_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 a_511_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.69e+12p pd=2.338e+07u as=1.16e+12p ps=1.032e+07u
-M1001 a_503_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.157e+12p pd=8.76e+06u as=1.48525e+12p ps=1.367e+07u
-M1002 a_1375_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=7.67e+11p pd=7.56e+06u as=1.313e+12p ps=1.184e+07u
-M1003 Y C1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=2.01e+12p ps=1.802e+07u
-M1004 a_27_297# B1 a_511_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A2 a_511_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_1375_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A2 a_511_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1375_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_297# C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A1 a_1375_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_511_297# B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_511_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_511_297# B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B2 a_503_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y C1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1375_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_297# B2 a_511_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A1 a_511_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_503_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y B1 a_503_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_511_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A2 a_1375_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_297# B1 a_511_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_503_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_27_297# C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_503_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_511_297# B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_511_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_511_297# B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_27_297# B2 a_511_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR A1 a_511_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND B2 a_503_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND A2 a_1375_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Y B1 a_503_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 Y A1 a_1375_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_511_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_503_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_1375_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR A2 a_511_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VPWR A1 a_511_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_1375_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VGND A2 a_1375_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_27_297# B1 a_511_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_511_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_503_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 Y B1 a_503_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_511_297# B2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_1375_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_27_297# B2 a_511_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_511_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VGND A2 a_1375_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 Y A1 a_1375_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_27_297# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR A1 a_511_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 Y A1 a_1375_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 Y C1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 VGND B2 a_503_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 a_511_297# B2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 VGND B2 a_503_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X28 a_503_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 Y B1 a_503_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 a_503_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 a_27_297# B2 a_511_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 a_511_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 a_511_297# B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X34 a_511_297# B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 a_1375_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X36 a_27_297# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X37 a_27_297# B1 a_511_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X38 Y C1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X39 a_511_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.cdl b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.cdl
index 9f54a4a..15891dd 100644
--- a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.cdl
+++ b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__a222oi_1 A1 A2 B1 B2 C1 C2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I C2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 pndB B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 Y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI8 Y C2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 Y C1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Y C2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net62 C2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI10 net62 C2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a222oi_1
diff --git a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.netlist.tsv b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.netlist.tsv
index c226c65..0c833f4 100644
--- a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.netlist.tsv
+++ b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__a222oi_1	A1:I A2:I B1:I B2:I C1:I C2:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Y	C2	pndB	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	net62	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net62	C2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Y	C2	pndB	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	net62	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net62	C2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.spice b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.spice
index 849ed64..9a7325b 100644
--- a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.spice
+++ b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__a222oi_1 A1 A2 B1 B2 C1 C2 VGND VNB VPB VPWR Y
-M1000 a_357_297# B1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.3e+11p pd=7.66e+06u as=5.8e+11p ps=5.16e+06u
-M1001 Y C2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=0p ps=0u
-M1002 VGND C2 a_119_47# VNB nshort w=640000u l=150000u
-+  ad=9.28e+11p pd=5.46e+06u as=1.344e+11p ps=1.7e+06u
-M1003 Y B1 a_449_47# VNB nshort w=640000u l=150000u
-+  ad=4.416e+11p pd=3.94e+06u as=1.344e+11p ps=1.7e+06u
-M1004 a_117_297# B2 a_357_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_627_47# A1 Y VNB nshort w=640000u l=150000u
-+  ad=2.432e+11p pd=2.04e+06u as=0p ps=0u
-M1006 a_117_297# C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_357_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.5e+11p ps=2.7e+06u
-M1008 VGND A2 a_627_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_357_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_449_47# B2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_119_47# C1 Y VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y C1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_117_297# B1 a_357_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_119_47# C2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_357_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y C1 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_357_297# B2 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y A1 a_627_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 VPWR A2 a_357_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_117_297# C2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_449_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_627_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 VGND B2 a_449_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_1.cdl b/cells/a22o/sky130_fd_sc_hdll__a22o_1.cdl
index e86eb25..ff4ef01 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_1.cdl
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a22o_1 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a22o_1
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_1.netlist.tsv b/cells/a22o/sky130_fd_sc_hdll__a22o_1.netlist.tsv
index cc5462e..a14368f 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_1.netlist.tsv
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__a22o_1	A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	y	B2	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_1.spice b/cells/a22o/sky130_fd_sc_hdll__a22o_1.spice
index 8634516..5325ddb 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_1.spice
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__a22o_1 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_27_297# B1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=6.3e+11p ps=5.26e+06u
-M1001 VGND A2 a_411_47# VNB nshort w=650000u l=150000u
-+  ad=4.355e+11p pd=3.94e+06u as=2.405e+11p ps=2.04e+06u
-M1002 a_27_297# B1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=4.03e+11p pd=3.84e+06u as=1.755e+11p ps=1.84e+06u
-M1003 a_117_297# B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_411_47# A1 a_27_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=6e+11p pd=5.2e+06u as=0p ps=0u
-M1006 X a_27_297# VGND VNB nshort w=650000u l=150000u
-+  ad=2.6e+11p pd=2.1e+06u as=0p ps=0u
-M1007 X a_27_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=4.1e+11p pd=2.82e+06u as=0p ps=0u
-M1008 a_117_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_119_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_27_297# B2 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_27_297# A1 a_411_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_117_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_119_47# B1 a_27_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VGND B2 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_117_297# B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_411_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VPWR a_27_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND a_27_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_2.cdl b/cells/a22o/sky130_fd_sc_hdll__a22o_2.cdl
index 4a0a7af..f8e74ae 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_2.cdl
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a22o_2 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a22o_2
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_2.netlist.tsv b/cells/a22o/sky130_fd_sc_hdll__a22o_2.netlist.tsv
index c0edad0..83c6fc7 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_2.netlist.tsv
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__a22o_2	A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	y	B2	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_2.spice b/cells/a22o/sky130_fd_sc_hdll__a22o_2.spice
index 753cb25..db8b911 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_2.spice
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__a22o_2 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_27_297# B1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=6.4e+11p ps=5.28e+06u
-M1001 X a_27_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=1.01e+12p ps=8.02e+06u
-M1002 VGND a_27_297# X VNB nshort w=650000u l=150000u
-+  ad=6.955e+11p pd=6.04e+06u as=2.08e+11p ps=1.94e+06u
-M1003 VPWR A2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_27_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_117_297# B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_411_47# A1 a_27_297# VNB nshort w=650000u l=150000u
-+  ad=2.47e+11p pd=2.06e+06u as=4.03e+11p ps=3.84e+06u
-M1007 VGND A2 a_411_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_117_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_119_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.495e+11p pd=1.76e+06u as=0p ps=0u
-M1010 a_27_297# B1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_27_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_119_47# B1 a_27_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_411_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_27_297# B2 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VPWR a_27_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_27_297# A1 a_411_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 X a_27_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND B2 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_117_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND a_27_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_117_297# B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 X a_27_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_4.cdl b/cells/a22o/sky130_fd_sc_hdll__a22o_4.cdl
index 666829b..3dd20e9 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_4.cdl
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a22o_4 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a22o_4
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_4.netlist.tsv b/cells/a22o/sky130_fd_sc_hdll__a22o_4.netlist.tsv
index 2c3e66e..307f1b9 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_4.netlist.tsv
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__a22o_4	A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	y	B2	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_4.spice b/cells/a22o/sky130_fd_sc_hdll__a22o_4.spice
index f85bbcb..7c4c7a0 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_4.spice
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__a22o_4 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_1008_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=3.835e+11p pd=3.78e+06u as=1.3975e+12p ps=1.08e+07u
-M1001 X a_96_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.43e+12p ps=1.286e+07u
-M1002 VPWR A2 a_524_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.515e+12p ps=1.303e+07u
-M1003 a_96_21# B1 a_524_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1004 VGND A2 a_1008_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_96_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_524_297# B1 a_96_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_96_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1008 VGND a_96_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_616_47# B1 a_96_21# VNB nshort w=650000u l=150000u
-+  ad=3.51e+11p pd=3.68e+06u as=4.81e+11p ps=4.08e+06u
-M1010 a_524_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1008_47# A1 a_96_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_96_21# B2 a_524_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_96_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B2 a_616_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_96_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_96_21# B1 a_616_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A1 a_524_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_96_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_616_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_96_21# A1 a_1008_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_524_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_96_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_524_297# B2 a_96_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_96_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VGND B2 a_616_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_616_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_96_21# A1 a_1008_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 X a_96_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 X a_96_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_96_21# B1 a_616_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VPWR A2 a_524_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VGND a_96_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_96_21# B2 a_524_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_524_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VPWR a_96_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_524_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_524_297# B1 a_96_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 VGND A2 a_1008_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_1008_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_1008_47# A1 a_96_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VPWR A1 a_524_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VGND a_96_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 X a_96_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 a_96_21# B1 a_524_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 a_616_47# B1 a_96_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 VPWR a_96_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 a_524_297# B2 a_96_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.cdl b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.cdl
index 83c11dd..60d5d7a 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.cdl
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a22oi_1 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 Y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 Y B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 Y B2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a22oi_1
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.netlist.tsv b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.netlist.tsv
index e8433af..0d92695 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.netlist.tsv
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.spice b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.spice
index e33ee56..d7936ed 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.spice
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__a22oi_1 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 Y B1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=5.8e+11p ps=5.16e+06u
-M1001 Y B1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=1.755e+11p ps=1.84e+06u
-M1002 a_117_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_411_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=0p ps=0u
-M1004 VPWR A2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1005 a_117_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2 a_411_47# VNB nshort w=650000u l=150000u
-+  ad=4.29e+11p pd=3.92e+06u as=0p ps=0u
-M1007 a_119_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_411_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 Y B2 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 Y A1 a_411_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_119_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VGND B2 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_117_297# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_117_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.cdl b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.cdl
index c0f19fc..c1cb505 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.cdl
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a22oi_2 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 Y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 Y B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 Y B2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a22oi_2
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.netlist.tsv b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.netlist.tsv
index b050536..9573658 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.netlist.tsv
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.spice b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.spice
index 7d5e78f..c64ad86 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.spice
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__a22oi_2 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 Y B2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.3e+11p pd=7.66e+06u as=1.51e+12p ps=1.302e+07u
-M1001 a_27_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=5.46e+11p pd=5.58e+06u as=4.485e+11p ps=3.98e+06u
-M1002 a_507_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=6.11e+11p pd=5.78e+06u as=4.485e+11p ps=3.98e+06u
-M1003 a_117_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1004 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_507_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A1 a_507_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_117_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_117_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A2 a_507_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_117_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A1 a_507_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_27_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 Y B2 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_117_297# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VPWR A1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND B2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y B1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VPWR A2 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 Y B1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_117_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_27_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_507_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_507_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_117_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_117_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VGND A2 a_507_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.cdl b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.cdl
index fe40a77..d78ddf7 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.cdl
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a22oi_4 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 Y B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 Y B2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 Y B2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a22oi_4
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.netlist.tsv b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.netlist.tsv
index 5e5c265..c673505 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.netlist.tsv
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.spice b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.spice
index fc96b71..6fdb211 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.spice
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hdll__a22oi_4 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=3.13e+12p pd=2.426e+07u as=1.16e+12p ps=1.032e+07u
-M1001 a_883_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=9.295e+11p pd=9.36e+06u as=8.97e+11p ps=7.96e+06u
-M1002 a_27_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A2 a_883_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=0p ps=0u
-M1005 a_883_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=8.645e+11p ps=7.86e+06u
-M1006 Y B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=9.62e+11p ps=9.46e+06u
-M1009 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A1 a_883_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_883_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A2 a_883_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_883_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y A1 a_883_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_297# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y B1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_27_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_883_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR A2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 Y B1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR A2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_27_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_27_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Y B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VPWR A1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 Y A1 a_883_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_27_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 Y A1 a_883_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 Y B2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_27_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_27_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_27_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VGND B2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 VGND A2 a_883_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 VPWR A1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VGND B2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_27_297# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 a_27_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 VGND A2 a_883_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_883_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 Y B2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 a_27_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X28 a_883_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 a_27_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 a_883_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 Y B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.cdl b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.cdl
index 6cd63f4..9844cd4 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.cdl
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__a2bb2o_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor0 inor A1_N VNB 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
+MMPaoi20 y inor VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-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.18 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
-MMPaoi20 y inor 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 y 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
-MMPnor0 VPWR A1_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA1N A2_N VPB 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
-MMPaoi10 pmid B1 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
-MMPaoi11 pmid B2 VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a2bb2o_1
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.netlist.tsv b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.netlist.tsv
index d57b16a..deac2f0 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.netlist.tsv
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.65	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
-MMPaoi20	MOSFET	y	inor	pmid	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.65	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
+MMPaoi20	MOSFET	y	inor	pmid	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.spice b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.spice
index c7d5054..09c7560 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.spice
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__a2bb2o_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 a_525_413# a_243_47# a_79_21# VPB phighvt w=420000u l=180000u
-+  ad=2.352e+11p pd=2.8e+06u as=1.134e+11p ps=1.38e+06u
-M1001 a_611_47# B2 a_79_21# VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=1.134e+11p ps=1.38e+06u
-M1002 a_79_21# a_243_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=7.746e+11p ps=6.34e+06u
-M1003 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=4.674e+11p pd=4.32e+06u as=2.7e+11p ps=2.54e+06u
-M1004 a_241_297# A1_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.029e+11p pd=1.33e+06u as=0p ps=0u
-M1005 a_525_413# B1 VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2_N a_243_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1007 VGND B1 a_611_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_243_47# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_243_47# A2_N a_241_297# VPB phighvt w=420000u l=180000u
-+  ad=1.155e+11p pd=1.39e+06u as=0p ps=0u
-M1010 VPWR B2 a_525_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
+X0 a_525_413# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 a_79_21# a_243_47# a_525_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 X a_79_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_241_297# A2_N a_243_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 VGND A1_N a_243_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR A1_N a_241_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 a_243_47# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_79_21# B2 a_611_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_611_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 X a_79_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VPWR B1 a_525_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X11 VGND a_243_47# a_79_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.cdl b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.cdl
index e697640..a924037 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.cdl
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__a2bb2o_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor0 inor A1_N VNB 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
+MMPaoi20 y inor VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-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.18 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
-MMPaoi20 y inor VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A1_N VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA1N A2_N VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a2bb2o_2
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.netlist.tsv b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.netlist.tsv
index e3a6aa2..72f4b1a 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.netlist.tsv
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.65	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
-MMPaoi20	MOSFET	y	inor	pmid	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.65	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
+MMPaoi20	MOSFET	y	inor	pmid	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.spice b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.spice
index f6b4f62..c17f709 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.spice
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_hdll__a2bb2o_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 X a_82_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=8.49e+11p ps=7.32e+06u
-M1001 a_696_47# B2 a_82_21# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=1.134e+11p ps=1.38e+06u
-M1002 a_343_47# A2_N a_341_297# VPB phighvt w=640000u l=180000u
-+  ad=1.76e+11p pd=1.83e+06u as=1.472e+11p ps=1.74e+06u
-M1003 VGND a_82_21# X VNB nshort w=650000u l=150000u
-+  ad=9.0065e+11p pd=7.95e+06u as=2.08e+11p ps=1.94e+06u
-M1004 a_622_369# B1 VPWR VPB phighvt w=640000u l=180000u
-+  ad=3.808e+11p pd=3.75e+06u as=0p ps=0u
-M1005 VGND A2_N a_343_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1006 a_343_47# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_622_369# a_343_47# a_82_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1008 a_341_297# A1_N VPWR VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B2 a_622_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_82_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_82_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B1 a_696_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_82_21# a_343_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1_N a_343_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_341_297# A2_N a_343_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X2 a_82_21# B2 a_696_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_82_21# a_343_47# a_622_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X4 VGND a_343_47# a_82_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR a_82_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VPWR B1 a_622_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X7 a_622_369# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X8 X a_82_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_696_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND a_82_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_343_47# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR A1_N a_341_297# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X13 X a_82_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.cdl b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.cdl
index d09e7a9..4e9f000 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.cdl
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__a2bb2o_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor0 inor A1_N VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inor VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inor VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A1_N VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA1N A2_N VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi20 y inor VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPaoi20 y inor VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a2bb2o_4
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.netlist.tsv b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.netlist.tsv
index d733bc9..86de2db 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.netlist.tsv
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inor	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inor	pmid	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.65	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.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inor	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inor	pmid	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.spice b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.spice
index d2b2e4e..f4b70d7 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.spice
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_hdll__a2bb2o_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 a_455_21# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=3.835e+11p pd=3.78e+06u as=1.716e+12p ps=1.438e+07u
-M1001 a_27_297# B2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.12e+12p pd=1.024e+07u as=1.7e+12p ps=1.54e+07u
-M1002 X a_203_47# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1003 X a_203_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1004 VPWR A1_N a_785_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1005 a_27_297# a_455_21# a_203_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1006 a_203_47# B2 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=4.81e+11p pd=4.08e+06u as=3.835e+11p ps=3.78e+06u
-M1007 VGND a_203_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_203_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A1_N a_455_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_203_47# a_455_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_203_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_785_297# A2_N a_455_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1014 VGND a_455_21# a_203_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_203_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_455_21# A2_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_119_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND B1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_455_21# A2_N a_785_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_203_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_203_47# a_455_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_203_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A2_N a_455_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_785_297# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_119_47# B2 a_203_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_297# a_455_21# a_203_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR A1_N a_785_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_203_47# B2 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 X a_203_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_455_21# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_27_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_785_297# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND a_455_21# a_203_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VPWR B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_455_21# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 X a_203_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_27_297# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 X a_203_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VPWR a_203_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_119_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 X a_203_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_119_47# B2 a_203_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_455_21# A2_N a_785_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VGND B1 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 VPWR B2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VGND A1_N a_455_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 VGND a_203_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_203_47# a_455_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VPWR a_203_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 VGND A2_N a_455_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 VGND a_203_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 a_203_47# a_455_21# a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 a_785_297# A2_N a_455_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.cdl b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.cdl
index 0e405ed..3e236c4 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.cdl
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a2bb2oi_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnor0 inor A1_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inor VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A1_N VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA1N A2_N VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi20 Y inor VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 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
-MMPaoi11 pmid B2 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
-MMPaoi20 Y inor 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
+MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inor VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a2bb2oi_1
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.netlist.tsv b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.netlist.tsv
index 91ebb2b..36659a0 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.netlist.tsv
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inor	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inor	pmid	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nfet_01v8	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inor	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inor	pmid	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.spice b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.spice
index 86c2f67..661dfe0 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.spice
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__a2bb2oi_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 a_521_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=1.82e+11p pd=1.86e+06u as=2.6e+11p ps=2.1e+06u
-M1001 a_119_47# A2_N a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=2.3e+11p ps=2.46e+06u
-M1002 a_117_297# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.7e+11p ps=5.14e+06u
-M1003 VGND A2_N a_119_47# VNB nshort w=650000u l=150000u
-+  ad=9.425e+11p pd=6.8e+06u as=2.145e+11p ps=1.96e+06u
-M1004 Y a_119_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_409_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6.4e+11p pd=5.28e+06u as=0p ps=0u
-M1006 a_409_297# a_119_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1007 a_119_47# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND B1 a_521_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B2 a_409_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_521_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_409_297# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 Y a_119_47# a_409_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VPWR A1_N a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND a_119_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VGND A1_N a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_119_47# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y B2 a_521_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VPWR B1 a_409_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_117_297# A2_N a_119_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.cdl b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.cdl
index b57e50b..8f58a69 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.cdl
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a2bb2oi_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnor0 inor A1_N VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inor VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A1_N VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA1N A2_N VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi20 Y inor VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inor VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inor VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a2bb2oi_2
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.netlist.tsv b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.netlist.tsv
index 2168b40..9e92986 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.netlist.tsv
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inor	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inor	pmid	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nfet_01v8	2	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inor	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inor	pmid	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.spice b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.spice
index 321e09b..9697aea 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.spice
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__a2bb2oi_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 a_27_297# B2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.12e+12p pd=1.024e+07u as=8.7e+11p ps=7.74e+06u
-M1001 a_695_297# A2_N a_455_21# VPB phighvt w=1e+06u l=180000u
-+  ad=8.5e+11p pd=7.7e+06u as=2.9e+11p ps=2.58e+06u
-M1002 a_27_297# a_455_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1003 Y B2 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=3.835e+11p ps=3.78e+06u
-M1004 a_455_21# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=4.81e+11p pd=4.08e+06u as=1.2805e+12p ps=1.044e+07u
-M1005 VPWR B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2_N a_455_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_455_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_455_21# A2_N a_695_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_119_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_695_297# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A1_N a_455_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_455_21# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y a_455_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_455_21# A2_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A1_N a_695_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_119_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_297# a_455_21# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_695_297# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 Y B2 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 Y a_455_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND A2_N a_455_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_455_21# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_455_21# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_27_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_455_21# A2_N a_695_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND a_455_21# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VPWR B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_27_297# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_119_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_119_47# B2 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_695_297# A2_N a_455_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VGND B1 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VPWR B2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 Y a_455_21# a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VPWR A1_N a_695_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 VGND A1_N a_455_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.cdl b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.cdl
index 73c72aa..7c5cd3d 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.cdl
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a2bb2oi_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnor0 inor A1_N VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inor VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A1_N VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA1N A2_N VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi20 Y inor VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inor VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inor VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a2bb2oi_4
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.netlist.tsv b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.netlist.tsv
index 1fbc2b2..349aeab 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.netlist.tsv
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inor	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inor	pmid	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nfet_01v8	4	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inor	VGND	VNB	nfet_01v8	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inor	pmid	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.spice b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.spice
index f567974..3449499 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.spice
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_hdll__a2bb2oi_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 a_27_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.99e+12p pd=1.798e+07u as=1.74e+12p ps=1.548e+07u
-M1001 VGND A1_N a_831_21# VNB nshort w=650000u l=150000u
-+  ad=2.067e+12p pd=1.806e+07u as=8.97e+11p ps=7.96e+06u
-M1002 a_27_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_831_21# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_297# a_831_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1005 VPWR B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_831_21# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=8.97e+11p ps=7.96e+06u
-M1007 a_831_21# A2_N a_1259_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.43e+12p ps=1.286e+07u
-M1008 Y a_831_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_831_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_297# B2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B1 a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.995e+11p ps=7.66e+06u
-M1012 VGND B1 a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A1_N a_1259_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_109_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_831_21# A2_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1259_297# A2_N a_831_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_831_21# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A1_N a_831_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1259_297# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_831_21# A2_N a_1259_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_297# a_831_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_831_21# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A2_N a_831_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_297# B2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A1_N a_1259_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1259_297# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y a_831_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y B2 a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_109_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_109_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Y B2 a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 Y a_831_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1259_297# A2_N a_831_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_831_21# A2_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_109_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND A2_N a_831_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_297# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND B1 a_109_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_109_47# B2 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_1259_297# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y a_831_21# a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VPWR A1_N a_1259_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_27_297# a_831_21# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VPWR A1_N a_1259_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_27_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 Y B2 a_109_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 Y a_831_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_831_21# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 Y B2 a_109_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VPWR B2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_831_21# A2_N a_1259_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_27_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_1259_297# A2_N a_831_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 a_27_297# a_831_21# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_831_21# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_1259_297# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VGND a_831_21# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_831_21# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 a_109_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 a_27_297# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 VGND a_831_21# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 a_831_21# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 a_109_47# B2 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X28 VGND A1_N a_831_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 VPWR B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 a_831_21# A2_N a_1259_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 VGND B1 a_109_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X32 Y a_831_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X33 Y a_831_21# a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X34 a_1259_297# A2_N a_831_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 VGND A2_N a_831_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X36 VGND A1_N a_831_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X37 VPWR B2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X38 a_109_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X39 VGND A2_N a_831_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_1.cdl b/cells/a31o/sky130_fd_sc_hdll__a31o_1.cdl
index 12ee6c5..144e992 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_1.cdl
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a31o_1 A1 A2 A3 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y 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
-MMNA0 y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a31o_1
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_1.netlist.tsv b/cells/a31o/sky130_fd_sc_hdll__a31o_1.netlist.tsv
index aead0cf..34893a8 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_1.netlist.tsv
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__a31o_1	A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_1.spice b/cells/a31o/sky130_fd_sc_hdll__a31o_1.spice
index 46d43de..ef3545d 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_1.spice
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__a31o_1 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 VGND B1 a_80_21# VNB nshort w=650000u l=150000u
-+  ad=4.9075e+11p pd=4.11e+06u as=2.47e+11p ps=2.06e+06u
-M1001 VPWR A2 a_225_297# VPB phighvt w=1e+06u l=180000u
-+  ad=7.05e+11p pd=5.41e+06u as=7e+11p ps=5.4e+06u
-M1002 a_225_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_80_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.55e+06u
-M1004 VGND a_80_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.7225e+11p ps=1.83e+06u
-M1005 a_225_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_323_47# A2 a_217_47# VNB nshort w=650000u l=150000u
-+  ad=2.47e+11p pd=2.06e+06u as=2.47e+11p ps=2.06e+06u
-M1007 a_80_21# A1 a_323_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_217_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_80_21# B1 a_225_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.3e+11p pd=2.66e+06u as=0p ps=0u
+X0 VGND A3 a_217_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_225_297# B1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_225_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VPWR A3 a_225_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_323_47# A1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_217_47# A2 a_323_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VPWR A1 a_225_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_80_21# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_2.cdl b/cells/a31o/sky130_fd_sc_hdll__a31o_2.cdl
index e1cf823..140b0b4 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_2.cdl
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a31o_2 A1 A2 A3 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a31o_2
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_2.netlist.tsv b/cells/a31o/sky130_fd_sc_hdll__a31o_2.netlist.tsv
index e828a1d..77ca0d5 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_2.netlist.tsv
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__a31o_2	A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_2.spice b/cells/a31o/sky130_fd_sc_hdll__a31o_2.spice
index 1615f09..71a6829 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_2.spice
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__a31o_2 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=9.1e+11p pd=7.82e+06u as=2.9e+11p ps=2.58e+06u
-M1001 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=5.46e+11p pd=5.58e+06u as=2.405e+11p ps=2.04e+06u
-M1002 a_79_21# A1 a_391_47# VNB nshort w=650000u l=150000u
-+  ad=3.38e+11p pd=2.34e+06u as=2.47e+11p ps=2.06e+06u
-M1003 VGND B1 a_79_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_305_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6.4e+11p pd=5.28e+06u as=0p ps=0u
-M1005 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A2 a_305_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_79_21# B1 a_305_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.3e+11p pd=2.66e+06u as=0p ps=0u
-M1008 a_305_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_391_47# A2 a_307_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1011 a_307_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A3 a_307_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VPWR a_79_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_305_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 X a_79_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR A3 a_305_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_391_47# A1 a_79_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_305_297# B1 a_79_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_307_47# A2 a_391_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 X a_79_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND a_79_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_79_21# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VPWR A1 a_305_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_4.cdl b/cells/a31o/sky130_fd_sc_hdll__a31o_4.cdl
index 638a6eb..9080bbd 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_4.cdl
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a31o_4 A1 A2 A3 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a31o_4
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_4.netlist.tsv b/cells/a31o/sky130_fd_sc_hdll__a31o_4.netlist.tsv
index 91303c7..931d84d 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_4.netlist.tsv
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__a31o_4	A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_4.spice b/cells/a31o/sky130_fd_sc_hdll__a31o_4.spice
index 616c14b..81c3fcc 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_4.spice
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__a31o_4 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.47e+12p pd=1.294e+07u as=1.76e+12p ps=1.552e+07u
-M1001 a_213_47# A2 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=2.08e+11p ps=1.94e+06u
-M1002 a_27_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_297_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1004 VGND a_297_47# X VNB nshort w=650000u l=150000u
-+  ad=1.404e+12p pd=1.082e+07u as=4.16e+11p ps=3.88e+06u
-M1005 a_297_47# A1 a_213_47# VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1006 VPWR a_297_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A3 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_297_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# B1 a_297_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1010 VGND a_297_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B1 a_297_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_297_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_495_47# A2 a_401_47# VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=2.08e+11p ps=1.94e+06u
-M1015 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_119_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_401_47# A1 a_297_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_297_47# B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A3 a_495_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_297_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_297_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_297_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_495_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VGND a_297_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_401_47# A2 a_495_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_213_47# A1 a_297_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_27_297# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_297_47# B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_27_297# B1 a_297_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VGND a_297_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VPWR A1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_119_47# A2 a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_297_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 X a_297_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_27_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_297_47# A1 a_401_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 X a_297_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 X a_297_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 VGND A3 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 VPWR a_297_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 VPWR a_297_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VPWR A2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR A3 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 VGND B1 a_297_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 X a_297_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.cdl b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.cdl
index 05f71ad..88adb6c 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.cdl
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a31oi_1 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 Y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 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
-MMPB0 Y B1 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
-MMNA0 Y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a31oi_1
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.netlist.tsv b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.netlist.tsv
index c263fa3..91229c0 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.netlist.tsv
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.spice b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.spice
index 7f22f37..7fa1ba3 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.spice
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__a31oi_1 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 VPWR A2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.95e+11p pd=5.19e+06u as=6.35e+11p ps=5.27e+06u
-M1001 a_117_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_203_47# A2 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=2.3075e+11p pd=2.01e+06u as=1.755e+11p ps=1.84e+06u
-M1003 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=5.2e+11p pd=4.2e+06u as=2.4375e+11p ps=2.05e+06u
-M1004 a_117_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_119_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1007 Y A1 a_203_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VPWR A3 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_119_47# A2 a_203_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND A3 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_117_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_117_297# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_203_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.cdl b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.cdl
index f28d461..cb05f2c 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.cdl
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a31oi_2 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 Y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a31oi_2
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.netlist.tsv b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.netlist.tsv
index 66d3bb8..a7aa96b 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.netlist.tsv
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.spice b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.spice
index 7581331..3b9c98a 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.spice
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__a31oi_2 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 Y A1 a_297_47# VNB nshort w=650000u l=150000u
-+  ad=6.37e+11p pd=5.86e+06u as=4.68e+11p ps=4.04e+06u
-M1001 a_27_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.5e+12p pd=1.3e+07u as=1.47e+12p ps=8.94e+06u
-M1002 a_27_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=5.46e+11p pd=5.58e+06u as=4.68e+11p ps=4.04e+06u
-M1003 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_297_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_297_47# A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A3 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.7e+11p pd=2.74e+06u as=0p ps=0u
-M1009 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A3 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_47# A2 a_297_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_297_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_27_47# A2 a_297_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_27_297# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VPWR A2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND A3 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_27_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 Y A1 a_297_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_297_47# A2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_27_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VPWR A1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VPWR A3 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_27_297# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 Y B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.cdl b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.cdl
index 2c60653..5a46200 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.cdl
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a31oi_4 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 Y B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a31oi_4
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.netlist.tsv b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.netlist.tsv
index 7a3cbea..90abf52 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.netlist.tsv
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.spice b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.spice
index 1b2d4c2..9283fc3 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.spice
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hdll__a31oi_4 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.2e+12p pd=2.44e+07u as=1.74e+12p ps=1.548e+07u
-M1001 a_27_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=9.62e+11p pd=9.46e+06u as=8.32e+11p ps=7.76e+06u
-M1003 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1006 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=1.0335e+12p pd=9.68e+06u as=0p ps=0u
-M1007 Y A1 a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=8.645e+11p ps=7.86e+06u
-M1008 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_47# A2 a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A3 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_485_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_485_47# A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A3 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_47# A2 a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y A1 a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_485_47# A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_485_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A3 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A3 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_27_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_485_47# A2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_485_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_27_297# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VPWR A2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_27_297# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR A1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR A1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_27_47# A2 a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VPWR A3 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_27_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 VGND A3 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 Y A1 a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_27_297# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_27_47# A2 a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 Y B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 VGND A3 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 a_27_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 a_27_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 a_27_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 Y A1 a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 VPWR A3 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 a_27_297# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 Y B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 VPWR A2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 a_485_47# A2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 a_485_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_1.cdl b/cells/a32o/sky130_fd_sc_hdll__a32o_1.cdl
index 0569559..ba612aa 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_1.cdl
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__a32o_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y 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
-MMNA0 y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a32o_1
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_1.netlist.tsv b/cells/a32o/sky130_fd_sc_hdll__a32o_1.netlist.tsv
index 1e88e2d..21737fa 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_1.netlist.tsv
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__a32o_1	A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	y	B2	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_1.spice b/cells/a32o/sky130_fd_sc_hdll__a32o_1.spice
index 3b4a47c..83847c0 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_1.spice
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__a32o_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_276_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=1.95e+11p pd=1.9e+06u as=6.045e+11p ps=4.46e+06u
-M1001 VPWR a_93_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=9.75e+11p pd=5.95e+06u as=3.4e+11p ps=2.68e+06u
-M1002 a_93_21# B1 a_268_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=1.015e+12p ps=8.03e+06u
-M1003 a_93_21# A1 a_366_47# VNB nshort w=650000u l=150000u
-+  ad=3.185e+11p pd=2.28e+06u as=3.575e+11p ps=2.4e+06u
-M1004 a_366_47# A2 a_276_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_93_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.145e+11p ps=1.96e+06u
-M1006 a_634_47# B1 a_93_21# VNB nshort w=650000u l=150000u
-+  ad=1.365e+11p pd=1.72e+06u as=0p ps=0u
-M1007 VPWR A2 a_268_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_268_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_268_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_268_297# B2 a_93_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B2 a_634_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_634_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_93_21# B2 a_268_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 X a_93_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 X a_93_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_268_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_268_297# B1 a_93_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_366_47# A1 a_93_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_276_47# A2 a_366_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VPWR A3 a_268_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR A1 a_268_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VGND A3 a_276_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_93_21# B1 a_634_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_2.cdl b/cells/a32o/sky130_fd_sc_hdll__a32o_2.cdl
index 986dbff..ad76bbd 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_2.cdl
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__a32o_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a32o_2
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_2.netlist.tsv b/cells/a32o/sky130_fd_sc_hdll__a32o_2.netlist.tsv
index af56b6d..c29fdb1 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_2.netlist.tsv
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__a32o_2	A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	y	B2	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_2.spice b/cells/a32o/sky130_fd_sc_hdll__a32o_2.spice
index c6e9e32..b9a30d0 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_2.spice
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_hdll__a32o_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 X a_21_199# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=1.01e+12p ps=8.02e+06u
-M1001 VGND a_21_199# X VNB nshort w=650000u l=150000u
-+  ad=8.5475e+11p pd=6.53e+06u as=2.08e+11p ps=1.94e+06u
-M1002 VPWR A1 a_319_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.5e+11p ps=7.7e+06u
-M1003 VPWR a_21_199# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_21_199# B1 a_382_47# VNB nshort w=650000u l=150000u
-+  ad=2.47e+11p pd=2.06e+06u as=2.3075e+11p ps=2.01e+06u
-M1005 a_319_297# B1 a_21_199# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1006 VPWR A3 a_319_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_589_47# A1 a_21_199# VNB nshort w=650000u l=150000u
-+  ad=3.445e+11p pd=2.36e+06u as=0p ps=0u
-M1008 a_21_199# B2 a_319_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_21_199# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_725_47# A2 a_589_47# VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=0p ps=0u
-M1011 a_319_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_382_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A3 a_725_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_319_297# B2 a_21_199# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 X a_21_199# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 X a_21_199# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND B2 a_382_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND a_21_199# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_319_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_319_297# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VPWR a_21_199# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_21_199# B1 a_319_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR A2 a_319_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_725_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_21_199# A1 a_589_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_382_47# B1 a_21_199# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_589_47# A2 a_725_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_4.cdl b/cells/a32o/sky130_fd_sc_hdll__a32o_4.cdl
index 953a279..b0ffee9 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_4.cdl
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__a32o_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 net73 B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 net73 B2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X net73 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 net73 A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 net73 B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X net73 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 net73 B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 net73 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X net73 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 net73 A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 net73 B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X net73 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a32o_4
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_4.netlist.tsv b/cells/a32o/sky130_fd_sc_hdll__a32o_4.netlist.tsv
index fecb2a2..e603ac5 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_4.netlist.tsv
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__a32o_4	A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	net73	B1	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	net73	B2	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	net73	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	net73	A1	sndA1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	net73	B1	sndB1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	net73	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	net73	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	net73	B2	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	net73	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	net73	A1	sndA1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	net73	B1	sndB1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	net73	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_4.spice b/cells/a32o/sky130_fd_sc_hdll__a32o_4.spice
index 2228c7a..7023a33 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_4.spice
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_hdll__a32o_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_79_21# B1 a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=2.36e+12p ps=1.672e+07u
-M1001 a_485_47# A2 a_695_47# VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=5.785e+11p ps=5.68e+06u
-M1002 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.7e+12p pd=1.54e+07u as=5.8e+11p ps=5.16e+06u
-M1003 a_493_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=9.62e+11p ps=9.46e+06u
-M1005 VPWR A3 a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_1194_47# B1 a_79_21# VNB nshort w=650000u l=150000u
-+  ad=6.0775e+11p pd=5.77e+06u as=4.16e+11p ps=3.88e+06u
-M1008 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_493_297# B2 a_79_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_493_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1194_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A1 a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_79_21# B2 a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B2 a_1194_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_695_47# A1 a_79_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_79_21# B1 a_1194_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_493_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_695_47# A2 a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_493_297# B1 a_79_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A3 a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_485_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_79_21# A1 a_695_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A2 a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A3 a_493_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_493_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_485_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_1194_47# B1 a_79_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_695_47# A1 a_79_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_493_297# B2 a_79_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND B2 a_1194_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND a_79_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_485_47# A2 a_695_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VPWR a_79_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VPWR A1 a_493_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VGND A3 a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_79_21# A1 a_695_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 X a_79_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 VPWR a_79_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_1194_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_79_21# B1 a_493_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_79_21# B1 a_1194_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 X a_79_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_493_297# B1 a_79_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 X a_79_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 a_493_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 X a_79_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 a_79_21# B2 a_493_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 VGND a_79_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_695_47# A2 a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 a_493_297# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 VPWR A2 a_493_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.cdl b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.cdl
index 69ac370..9566869 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.cdl
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a32oi_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 Y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 Y B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 Y B2 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
-MMNA0 Y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a32oi_1
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.netlist.tsv b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.netlist.tsv
index cca6c65..b2e52d2 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.netlist.tsv
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.spice b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.spice
index 05cc6c6..14ed391 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.spice
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__a32oi_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.02e+12p pd=8.04e+06u as=2.9e+11p ps=2.58e+06u
-M1001 Y B1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=3.445e+11p pd=2.36e+06u as=1.755e+11p ps=1.84e+06u
-M1002 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.6e+11p ps=5.12e+06u
-M1004 a_423_47# A2 a_339_47# VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=1.755e+11p ps=1.84e+06u
-M1005 a_119_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.03e+11p ps=3.84e+06u
-M1006 VGND A3 a_423_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A3 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_339_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y A1 a_339_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_339_47# A2 a_423_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_119_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND B2 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_423_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_27_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 Y B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR A2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_27_297# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.cdl b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.cdl
index 3ced823..721c3e6 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.cdl
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a32oi_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 Y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 Y B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 Y B2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a32oi_2
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.netlist.tsv b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.netlist.tsv
index a4f6b27..5b369e2 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.netlist.tsv
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.spice b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.spice
index e8a41fb..68f3b93 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.spice
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__a32oi_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.08e+12p pd=1.016e+07u as=1.71e+12p ps=1.542e+07u
-M1001 a_27_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1002 a_27_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=5.46e+11p pd=5.58e+06u as=6.4675e+11p ps=5.89e+06u
-M1003 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=0p ps=0u
-M1005 a_27_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A3 a_757_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.81e+11p ps=4.08e+06u
-M1007 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_507_47# A2 a_757_47# VNB nshort w=650000u l=150000u
-+  ad=5.135e+11p pd=5.48e+06u as=0p ps=0u
-M1009 VPWR A3 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_507_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A1 a_507_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_757_47# A2 a_507_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_757_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_757_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_27_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_27_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_507_47# A2 a_757_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 Y B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND B2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_27_297# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_27_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_27_297# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 Y A1 a_507_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 Y B1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VPWR A3 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_27_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VPWR A2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 Y B2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_757_47# A2 a_507_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VGND A3 a_757_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 VPWR A1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_507_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.cdl b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.cdl
index 5fd6d48..24900cb 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.cdl
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a32oi_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 Y B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 Y B2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 Y B2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a32oi_4
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.netlist.tsv b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.netlist.tsv
index 9b8743a..91712de 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.netlist.tsv
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.spice b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.spice
index 19fd342..3372787 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.spice
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_hdll__a32oi_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=3.925e+12p pd=2.985e+07u as=1.16e+12p ps=1.032e+07u
-M1001 a_27_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=9.62e+11p pd=9.46e+06u as=9.75e+11p ps=9.5e+06u
-M1003 a_893_47# A2 a_1379_47# VNB nshort w=650000u l=150000u
-+  ad=1.053e+12p pd=9.74e+06u as=8.97e+11p ps=7.96e+06u
-M1004 Y B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.195e+12p ps=1.639e+07u
-M1006 VPWR A3 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_893_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=8.645e+11p ps=7.86e+06u
-M1008 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A1 a_893_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1379_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1379_47# A2 a_893_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_893_47# A2 a_1379_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A3 a_1379_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_27_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR A3 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_893_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_27_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Y A1 a_893_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1379_47# A2 a_893_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1379_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND A3 a_1379_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_297# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_27_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 Y B1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_27_297# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y A1 a_893_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VPWR A1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VPWR A2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VPWR A3 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_893_47# A2 a_1379_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_27_297# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_1379_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_27_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 Y B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VPWR A1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_27_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VGND A3 a_1379_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 Y B2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_27_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VGND B2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_1379_47# A2 a_893_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_893_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 a_27_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 a_1379_47# A2 a_893_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 a_27_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 a_27_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 VGND B2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 a_27_297# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 a_27_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X28 a_1379_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 a_27_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 VPWR A2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 VPWR A3 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 a_893_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X33 VGND A3 a_1379_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X34 Y B2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 a_27_297# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X36 Y B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X37 Y B1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X38 Y A1 a_893_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X39 a_893_47# A2 a_1379_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_1.cdl b/cells/and2/sky130_fd_sc_hdll__and2_1.cdl
index 8f3b945..9ec5958 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_1.cdl
+++ b/cells/and2/sky130_fd_sc_hdll__and2_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__and2_1 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=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.65 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and2_1
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_1.netlist.tsv b/cells/and2/sky130_fd_sc_hdll__and2_1.netlist.tsv
index 912cd1e..73fe1e2 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_1.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_hdll__and2_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	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.65	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_1.spice b/cells/and2/sky130_fd_sc_hdll__and2_1.spice
index 1d7f254..0f7af09 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_1.spice
+++ b/cells/and2/sky130_fd_sc_hdll__and2_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hdll__and2_1 A B VGND VNB VPB VPWR X
-M1000 a_27_75# A VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=4.4565e+11p ps=4.17e+06u
-M1001 X a_27_75# VGND VNB nshort w=650000u l=150000u
-+  ad=2.3725e+11p pd=2.03e+06u as=2.406e+11p ps=2.11e+06u
-M1002 X a_27_75# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.2e+11p pd=3.04e+06u as=0p ps=0u
-M1003 VGND B a_123_75# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1004 VPWR B a_27_75# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_123_75# A a_27_75# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
+X0 VPWR a_27_75# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR A a_27_75# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 a_27_75# A a_123_75# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND a_27_75# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_123_75# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_27_75# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_2.cdl b/cells/and2/sky130_fd_sc_hdll__and2_2.cdl
index 71e3e97..a61292b 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_2.cdl
+++ b/cells/and2/sky130_fd_sc_hdll__and2_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__and2_2 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=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.65 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and2_2
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_2.netlist.tsv b/cells/and2/sky130_fd_sc_hdll__and2_2.netlist.tsv
index 182c5a1..0feaee6 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_2.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_hdll__and2_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	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.65	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_2.spice b/cells/and2/sky130_fd_sc_hdll__and2_2.spice
index 78ac86f..ebf9327 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_2.spice
+++ b/cells/and2/sky130_fd_sc_hdll__and2_2.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__and2_2 A B VGND VNB VPB VPWR X
-M1000 X a_27_75# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=4.1e+11p pd=2.82e+06u as=8.191e+11p ps=6.94e+06u
-M1001 X a_27_75# VGND VNB nshort w=650000u l=150000u
-+  ad=3.185e+11p pd=2.28e+06u as=4.656e+11p ps=4.16e+06u
-M1002 a_27_75# A VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1003 VGND a_27_75# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND B a_123_75# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1005 VPWR a_27_75# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR B a_27_75# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_123_75# A a_27_75# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
+X0 VGND a_27_75# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VPWR A a_27_75# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 a_27_75# A a_123_75# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 X a_27_75# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_123_75# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR a_27_75# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 X a_27_75# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_27_75# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_4.cdl b/cells/and2/sky130_fd_sc_hdll__and2_4.cdl
index 20cbbda..8bcfadb 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_4.cdl
+++ b/cells/and2/sky130_fd_sc_hdll__and2_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__and2_4 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB 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
-MMP1 y B 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
-MMIP0 X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and2_4
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_4.netlist.tsv b/cells/and2/sky130_fd_sc_hdll__and2_4.netlist.tsv
index 1d85eee..ed76bda 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_4.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_hdll__and2_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_4.spice b/cells/and2/sky130_fd_sc_hdll__and2_4.spice
index 6caa93a..851abe2 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_4.spice
+++ b/cells/and2/sky130_fd_sc_hdll__and2_4.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__and2_4 A B VGND VNB VPB VPWR X
-M1000 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6e+11p pd=5.2e+06u as=1.245e+12p ps=1.049e+07u
-M1001 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=7.085e+11p pd=6.08e+06u as=4.615e+11p ps=4.02e+06u
-M1002 a_120_47# A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=1.365e+11p pd=1.72e+06u as=2.0475e+11p ps=1.93e+06u
-M1003 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_47# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1005 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B a_120_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  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=180000u
+X1 a_120_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_27_47# A a_120_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR A a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_27_47# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_6.cdl b/cells/and2/sky130_fd_sc_hdll__and2_6.cdl
index df0312e..0d2650d 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_6.cdl
+++ b/cells/and2/sky130_fd_sc_hdll__and2_6.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__and2_6 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB phighvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 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=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and2_6
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_6.netlist.tsv b/cells/and2/sky130_fd_sc_hdll__and2_6.netlist.tsv
index f2a0d46..8a5db05 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_6.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_hdll__and2_6.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__and2_6	A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	y	A	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_6.spice b/cells/and2/sky130_fd_sc_hdll__and2_6.spice
index 2e4239f..69b06b3 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_6.spice
+++ b/cells/and2/sky130_fd_sc_hdll__and2_6.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__and2_6 A B VGND VNB VPB VPWR X
-M1000 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.72e+12p pd=1.544e+07u as=8.7e+11p ps=7.74e+06u
-M1001 VGND B a_293_47# VNB nshort w=650000u l=150000u
-+  ad=1.2155e+12p pd=1.024e+07u as=1.82e+11p ps=1.86e+06u
-M1002 VPWR A a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1003 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.265e+11p ps=5.52e+06u
-M1005 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_117_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_293_47# A a_117_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1009 a_117_297# A a_131_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.56e+11p ps=1.78e+06u
-M1010 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_131_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR B a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VPWR B a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_117_297# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_117_297# A a_293_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VPWR A a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VGND B a_131_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_293_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_117_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_131_47# A a_117_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_8.cdl b/cells/and2/sky130_fd_sc_hdll__and2_8.cdl
index 2cf492e..faf37d6 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_8.cdl
+++ b/cells/and2/sky130_fd_sc_hdll__and2_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__and2_8 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 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=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and2_8
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_8.netlist.tsv b/cells/and2/sky130_fd_sc_hdll__and2_8.netlist.tsv
index a8bc7b1..eab83b8 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_8.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_hdll__and2_8.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__and2_8	A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	y	A	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_8.spice b/cells/and2/sky130_fd_sc_hdll__and2_8.spice
index 3c7884c..5ac892b 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_8.spice
+++ b/cells/and2/sky130_fd_sc_hdll__and2_8.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__and2_8 A B VGND VNB VPB VPWR X
-M1000 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=2.01e+12p pd=1.802e+07u as=1.16e+12p ps=1.032e+07u
-M1001 VGND B a_293_47# VNB nshort w=650000u l=150000u
-+  ad=1.456e+12p pd=1.228e+07u as=1.82e+11p ps=1.86e+06u
-M1002 VPWR A a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1003 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.02e+11p ps=7.36e+06u
-M1006 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_117_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_293_47# A a_117_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1011 a_117_297# A a_131_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.56e+11p ps=1.78e+06u
-M1012 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_131_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR B a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VPWR B a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_117_297# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_117_297# A a_293_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VPWR A a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VGND B a_131_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 a_293_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_117_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 a_131_47# A a_117_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_1.cdl b/cells/and2b/sky130_fd_sc_hdll__and2b_1.cdl
index 1ddc9ab..763a481 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_1.cdl
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__and2b_1 A_N B VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB phighvt m=1 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and2b_1
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_1.netlist.tsv b/cells/and2b/sky130_fd_sc_hdll__and2b_1.netlist.tsv
index 372fa40..7a54aad 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_1.netlist.tsv
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	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.65	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_1.spice b/cells/and2b/sky130_fd_sc_hdll__and2b_1.spice
index fb4b07a..54e4e37 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_1.spice
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__and2b_1 A_N B VGND VNB VPB VPWR X
-M1000 VPWR A_N a_27_413# VPB phighvt w=420000u l=180000u
-+  ad=6.422e+11p pd=5.18e+06u as=1.134e+11p ps=1.38e+06u
-M1001 VGND B a_327_47# VNB nshort w=420000u l=150000u
-+  ad=3.653e+11p pd=3.54e+06u as=1.218e+11p ps=1.42e+06u
-M1002 a_225_413# a_27_413# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1003 a_327_47# a_27_413# a_225_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1004 X a_225_413# VGND VNB nshort w=650000u l=150000u
-+  ad=1.95e+11p pd=1.9e+06u as=0p ps=0u
-M1005 X a_225_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.1e+11p pd=2.62e+06u as=0p ps=0u
-M1006 a_27_413# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1007 VPWR B a_225_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_413# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 a_327_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND a_225_413# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR a_225_413# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VPWR a_27_413# a_225_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 VGND A_N a_27_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_225_413# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 a_225_413# a_27_413# a_327_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_2.cdl b/cells/and2b/sky130_fd_sc_hdll__and2b_2.cdl
index 7adaa9e..fce0815 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_2.cdl
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__and2b_2 A_N B VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB phighvt m=2 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and2b_2
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_2.netlist.tsv b/cells/and2b/sky130_fd_sc_hdll__and2b_2.netlist.tsv
index 65e6806..417c449 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_2.netlist.tsv
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	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.65	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_2.spice b/cells/and2b/sky130_fd_sc_hdll__and2b_2.spice
index 97740e4..7260811 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_2.spice
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__and2b_2 A_N B VGND VNB VPB VPWR X
-M1000 VPWR a_230_413# X VPB phighvt w=1e+06u l=180000u
-+  ad=9.248e+11p pd=7.78e+06u as=4.5e+11p ps=2.9e+06u
-M1001 VPWR A_N a_27_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1002 VGND B a_327_47# VNB nshort w=420000u l=150000u
-+  ad=5.4195e+11p pd=5.38e+06u as=1.344e+11p ps=1.48e+06u
-M1003 VPWR B a_230_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1004 VGND a_230_413# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.12e+11p ps=2.26e+06u
-M1005 a_327_47# a_27_413# a_230_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1006 a_27_413# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1007 X a_230_413# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_230_413# a_27_413# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_230_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_413# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VPWR a_27_413# a_230_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 a_327_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_230_413# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 X a_230_413# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 X a_230_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND a_230_413# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND A_N a_27_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_230_413# a_27_413# a_327_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_230_413# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_4.cdl b/cells/and2b/sky130_fd_sc_hdll__and2b_4.cdl
index 039dd40..d4edef3 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_4.cdl
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__and2b_4 A_N B VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB 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
-MMP1 y B 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.65 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.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + 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
+MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and2b_4
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_4.netlist.tsv b/cells/and2b/sky130_fd_sc_hdll__and2b_4.netlist.tsv
index 78f9253..6e9c813 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_4.netlist.tsv
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_4.spice b/cells/and2b/sky130_fd_sc_hdll__and2b_4.spice
index 151478f..f883296 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_4.spice
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_4.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_hdll__and2b_4 A_N B VGND VNB VPB VPWR X
-M1000 VPWR B a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=1.2757e+12p pd=1.065e+07u as=2.9e+11p ps=2.58e+06u
-M1001 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=6.1e+11p ps=5.22e+06u
-M1002 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=7.61e+11p pd=6.33e+06u as=4.615e+11p ps=4.02e+06u
-M1003 VGND B a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.365e+11p ps=1.72e+06u
-M1004 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_47# a_33_199# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_33_199# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1007 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_119_47# a_33_199# a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1009 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_33_199# A_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1011 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  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=180000u
+X1 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VPWR a_33_199# a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_119_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND A_N a_33_199# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_27_47# a_33_199# a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_27_47# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VPWR A_N a_33_199# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X12 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_1.cdl b/cells/and3/sky130_fd_sc_hdll__and3_1.cdl
index 43e3052..10ab44b 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_1.cdl
+++ b/cells/and3/sky130_fd_sc_hdll__and3_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__and3_1 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=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.65 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and3_1
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_1.netlist.tsv b/cells/and3/sky130_fd_sc_hdll__and3_1.netlist.tsv
index f30b39a..67c83e1 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_1.netlist.tsv
+++ b/cells/and3/sky130_fd_sc_hdll__and3_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	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.65	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_1.spice b/cells/and3/sky130_fd_sc_hdll__and3_1.spice
index fc1fe71..2c4c82c 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_1.spice
+++ b/cells/and3/sky130_fd_sc_hdll__and3_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__and3_1 A B C VGND VNB VPB VPWR X
-M1000 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=4.548e+11p ps=4.26e+06u
-M1001 a_213_47# B a_119_47# VNB nshort w=420000u l=150000u
-+  ad=2.247e+11p pd=1.91e+06u as=1.344e+11p ps=1.48e+06u
-M1002 VPWR A a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=3.255e+11p ps=3.23e+06u
-M1003 VGND C a_213_47# VNB nshort w=420000u l=150000u
-+  ad=2.58e+11p pd=2.2e+06u as=0p ps=0u
-M1004 VPWR C a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1006 a_119_47# A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1007 a_27_47# B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VPWR B a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 a_119_47# B a_213_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_27_47# A a_119_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 a_213_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_27_47# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_2.cdl b/cells/and3/sky130_fd_sc_hdll__and3_2.cdl
index aced004..660322c 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_2.cdl
+++ b/cells/and3/sky130_fd_sc_hdll__and3_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__and3_2 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=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.65 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and3_2
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_2.netlist.tsv b/cells/and3/sky130_fd_sc_hdll__and3_2.netlist.tsv
index 0168cf4..100339d 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_2.netlist.tsv
+++ b/cells/and3/sky130_fd_sc_hdll__and3_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	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.65	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_2.spice b/cells/and3/sky130_fd_sc_hdll__and3_2.spice
index c51af94..09f2727 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_2.spice
+++ b/cells/and3/sky130_fd_sc_hdll__and3_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__and3_2 A B C VGND VNB VPB VPWR X
-M1000 VGND a_29_311# X VNB nshort w=650000u l=150000u
-+  ad=5.093e+11p pd=4.31e+06u as=2.21e+11p ps=1.98e+06u
-M1001 VGND C a_194_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.281e+11p ps=1.45e+06u
-M1002 VPWR C a_29_311# VPB phighvt w=420000u l=180000u
-+  ad=8.325e+11p pd=6.94e+06u as=2.7055e+11p ps=3.05e+06u
-M1003 a_29_311# B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_194_53# B a_122_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1005 VPWR a_29_311# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1006 X a_29_311# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_29_311# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_122_53# A a_29_311# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1009 VPWR A a_29_311# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_29_311# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_122_53# B a_194_53# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_29_311# A a_122_53# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_29_311# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 VPWR a_29_311# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_29_311# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 VGND a_29_311# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_194_53# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR B a_29_311# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X9 X a_29_311# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_4.cdl b/cells/and3/sky130_fd_sc_hdll__and3_4.cdl
index d82d72e..7fe47e7 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_4.cdl
+++ b/cells/and3/sky130_fd_sc_hdll__and3_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__and3_4 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB 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
-MMP1 y B 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
-MMP2 y C 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
-MMIP0 X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and3_4
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_4.netlist.tsv b/cells/and3/sky130_fd_sc_hdll__and3_4.netlist.tsv
index 9474f7c..0f6d079 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_4.netlist.tsv
+++ b/cells/and3/sky130_fd_sc_hdll__and3_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_4.spice b/cells/and3/sky130_fd_sc_hdll__and3_4.spice
index a2b9c36..7a0c798 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_4.spice
+++ b/cells/and3/sky130_fd_sc_hdll__and3_4.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_hdll__and3_4 A B C VGND VNB VPB VPWR X
-M1000 X a_85_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6e+11p pd=5.2e+06u as=1.435e+12p ps=1.087e+07u
-M1001 a_85_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6.1e+11p pd=5.22e+06u as=0p ps=0u
-M1002 a_185_47# A a_85_297# VNB nshort w=650000u l=150000u
-+  ad=3.2175e+11p pd=2.29e+06u as=1.9825e+11p ps=1.91e+06u
-M1003 X a_85_297# VGND VNB nshort w=650000u l=150000u
-+  ad=4.615e+11p pd=4.02e+06u as=7.085e+11p ps=6.08e+06u
-M1004 VPWR a_85_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_85_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_314_47# B a_185_47# VNB nshort w=650000u l=150000u
-+  ad=1.365e+11p pd=1.72e+06u as=0p ps=0u
-M1007 VGND C a_314_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_85_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR C a_85_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_85_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_85_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_85_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_85_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B a_85_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 X a_85_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_85_297# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VPWR a_85_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_85_297# A a_185_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_314_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_85_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_185_47# B a_314_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 X a_85_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 X a_85_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VPWR a_85_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VGND a_85_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 X a_85_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VGND a_85_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_1.cdl b/cells/and3b/sky130_fd_sc_hdll__and3b_1.cdl
index 8e94cf9..f85c4f4 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_1.cdl
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__and3b_1 A_N B C VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB phighvt m=1 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and3b_1
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_1.netlist.tsv b/cells/and3b/sky130_fd_sc_hdll__and3b_1.netlist.tsv
index 8cf0903..26c83f7 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_1.netlist.tsv
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	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.65	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_1.spice b/cells/and3b/sky130_fd_sc_hdll__and3b_1.spice
index c36bdb0..ee42029 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_1.spice
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__and3b_1 A_N B C VGND VNB VPB VPWR X
-M1000 a_317_53# a_117_413# a_225_311# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=1.197e+11p ps=1.41e+06u
-M1001 X a_225_311# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=4.7045e+11p ps=4.01e+06u
-M1002 a_117_413# A_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=5.913e+11p ps=5.75e+06u
-M1003 a_225_311# B VPWR VPB phighvt w=420000u l=180000u
-+  ad=2.7055e+11p pd=3.05e+06u as=0p ps=0u
-M1004 VPWR C a_225_311# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_117_413# a_225_311# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_117_413# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1007 a_411_53# B a_317_53# VNB nshort w=420000u l=150000u
-+  ad=1.071e+11p pd=1.35e+06u as=0p ps=0u
-M1008 X a_225_311# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1009 VGND C a_411_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A_N a_117_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VPWR B a_225_311# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 a_317_53# B a_411_53# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_225_311# a_117_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 VGND A_N a_117_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_225_311# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 a_225_311# a_117_413# a_317_53# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_225_311# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_411_53# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND a_225_311# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_2.cdl b/cells/and3b/sky130_fd_sc_hdll__and3b_2.cdl
index c8656ed..54fa980 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_2.cdl
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__and3b_2 A_N B C VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB phighvt m=2 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and3b_2
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_2.netlist.tsv b/cells/and3b/sky130_fd_sc_hdll__and3b_2.netlist.tsv
index badbdf0..3e10c74 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_2.netlist.tsv
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	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.65	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_2.spice b/cells/and3b/sky130_fd_sc_hdll__and3b_2.spice
index 60aa5cf..5059b7f 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_2.spice
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__and3b_2 A_N B C VGND VNB VPB VPWR X
-M1000 a_117_311# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=6.936e+11p ps=5.94e+06u
-M1001 a_317_53# a_117_311# a_225_311# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=1.218e+11p ps=1.42e+06u
-M1002 a_117_311# A_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=9.409e+11p ps=8.31e+06u
-M1003 a_225_311# B VPWR VPB phighvt w=420000u l=180000u
-+  ad=2.7055e+11p pd=3.05e+06u as=0p ps=0u
-M1004 VPWR C a_225_311# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_225_311# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1006 X a_225_311# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_117_311# a_225_311# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_225_311# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1009 a_411_53# B a_317_53# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1010 VGND C a_411_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_225_311# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B a_225_311# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 a_317_53# B a_411_53# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 X a_225_311# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_225_311# a_117_311# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 VPWR A_N a_117_311# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 VGND A_N a_117_311# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_225_311# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 X a_225_311# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_225_311# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X9 a_225_311# a_117_311# a_317_53# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_411_53# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND a_225_311# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_4.cdl b/cells/and3b/sky130_fd_sc_hdll__and3b_4.cdl
index f90d22f..d9d38b2 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_4.cdl
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__and3b_4 A_N B C VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB 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
-MMP1 y B 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
-MMP2 y C 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 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.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + 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
+MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and3b_4
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_4.netlist.tsv b/cells/and3b/sky130_fd_sc_hdll__and3b_4.netlist.tsv
index 1e9845f..c34f5aa 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_4.netlist.tsv
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_4.spice b/cells/and3b/sky130_fd_sc_hdll__and3b_4.spice
index b0ab54b..10cd6a1 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_4.spice
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_4.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__and3b_4 A_N B C VGND VNB VPB VPWR X
-M1000 VGND C a_277_47# VNB nshort w=650000u l=150000u
-+  ad=7.285e+11p pd=6.23e+06u as=1.82e+11p ps=1.86e+06u
-M1001 VPWR a_56_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.3907e+12p pd=1.088e+07u as=6.1e+11p ps=5.22e+06u
-M1002 X a_56_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR C a_56_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=6.6e+11p ps=5.32e+06u
-M1004 X a_56_297# VGND VNB nshort w=650000u l=150000u
-+  ad=4.615e+11p pd=4.02e+06u as=0p ps=0u
-M1005 VPWR a_98_199# a_56_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_56_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_56_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_56_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_162_47# a_98_199# a_56_297# VNB nshort w=650000u l=150000u
-+  ad=2.7625e+11p pd=2.15e+06u as=2.3075e+11p ps=2.01e+06u
-M1010 VGND a_56_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_98_199# A_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.239e+11p pd=1.43e+06u as=0p ps=0u
-M1012 VPWR a_56_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_98_199# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.743e+11p pd=1.67e+06u as=0p ps=0u
-M1014 a_277_47# B a_162_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_56_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B a_56_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 X a_56_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 X a_56_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_56_297# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND a_56_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VPWR a_56_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 X a_56_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 X a_56_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_56_297# a_98_199# a_162_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_162_47# B a_277_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_277_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VGND a_56_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VPWR a_56_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VPWR A_N a_98_199# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X14 a_56_297# a_98_199# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VGND A_N a_98_199# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_1.cdl b/cells/and4/sky130_fd_sc_hdll__and4_1.cdl
index a5a961e..2e703e6 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_1.cdl
+++ b/cells/and4/sky130_fd_sc_hdll__and4_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__and4_1 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 y D VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=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.65 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and4_1
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_1.netlist.tsv b/cells/and4/sky130_fd_sc_hdll__and4_1.netlist.tsv
index f04ebec..4ca58e8 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_1.netlist.tsv
+++ b/cells/and4/sky130_fd_sc_hdll__and4_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	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.65	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_1.spice b/cells/and4/sky130_fd_sc_hdll__and4_1.spice
index 79b230f..39d7650 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_1.spice
+++ b/cells/and4/sky130_fd_sc_hdll__and4_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__and4_1 A B C D VGND VNB VPB VPWR X
-M1000 VGND D a_299_47# VNB nshort w=420000u l=150000u
-+  ad=2.7525e+11p pd=2.2e+06u as=1.428e+11p ps=1.52e+06u
-M1001 a_27_47# A VPWR VPB phighvt w=420000u l=180000u
-+  ad=2.52e+11p pd=2.88e+06u as=5.601e+11p ps=5.56e+06u
-M1002 a_203_47# B a_119_47# VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=1.134e+11p ps=1.38e+06u
-M1003 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=4.6e+11p pd=2.92e+06u as=0p ps=0u
-M1004 a_27_47# C VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=2.925e+11p pd=2.2e+06u as=0p ps=0u
-M1006 a_299_47# C a_203_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_119_47# A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1008 VPWR B a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR D a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_27_47# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 a_27_47# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 a_119_47# B a_203_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR C a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 a_27_47# A a_119_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_203_47# C a_299_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=180000u
+X9 a_299_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_2.cdl b/cells/and4/sky130_fd_sc_hdll__and4_2.cdl
index e12b4fe..18b0d89 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_2.cdl
+++ b/cells/and4/sky130_fd_sc_hdll__and4_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__and4_2 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 y D VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=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.65 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and4_2
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_2.netlist.tsv b/cells/and4/sky130_fd_sc_hdll__and4_2.netlist.tsv
index c6d4a95..fd52a19 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_2.netlist.tsv
+++ b/cells/and4/sky130_fd_sc_hdll__and4_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	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.65	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_2.spice b/cells/and4/sky130_fd_sc_hdll__and4_2.spice
index e10a945..22bba7f 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_2.spice
+++ b/cells/and4/sky130_fd_sc_hdll__and4_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__and4_2 A B C D VGND VNB VPB VPWR X
-M1000 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=5.1575e+11p pd=4.24e+06u as=2.795e+11p ps=2.16e+06u
-M1001 VGND D a_301_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
-M1002 a_27_47# A VPWR VPB phighvt w=420000u l=180000u
-+  ad=2.478e+11p pd=2.86e+06u as=9.943e+11p ps=8.44e+06u
-M1003 a_27_47# C VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.5e+11p pd=2.7e+06u as=0p ps=0u
-M1005 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_203_47# B a_119_47# VNB nshort w=420000u l=150000u
-+  ad=1.428e+11p pd=1.52e+06u as=1.134e+11p ps=1.38e+06u
-M1007 a_119_47# A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1008 VPWR B a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_301_47# C a_203_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR D a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_27_47# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 a_27_47# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 a_119_47# B a_203_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_27_47# A a_119_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR C a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X8 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_203_47# C a_301_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_301_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_4.cdl b/cells/and4/sky130_fd_sc_hdll__and4_4.cdl
index 5180905..6055015 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_4.cdl
+++ b/cells/and4/sky130_fd_sc_hdll__and4_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__and4_4 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB 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
-MMP1 y B 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
-MMP2 y C 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
-MMP3 y D 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
-MMIP0 X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and4_4
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_4.netlist.tsv b/cells/and4/sky130_fd_sc_hdll__and4_4.netlist.tsv
index 9f9be70..9be1769 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_4.netlist.tsv
+++ b/cells/and4/sky130_fd_sc_hdll__and4_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_4.spice b/cells/and4/sky130_fd_sc_hdll__and4_4.spice
index b158d2f..8a48e25 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_4.spice
+++ b/cells/and4/sky130_fd_sc_hdll__and4_4.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__and4_4 A B C D VGND VNB VPB VPWR X
-M1000 VPWR D a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=1.51e+12p pd=1.302e+07u as=7.4e+11p ps=5.48e+06u
-M1001 a_198_47# B a_119_47# VNB nshort w=650000u l=150000u
-+  ad=2.47e+11p pd=2.06e+06u as=1.5925e+11p ps=1.79e+06u
-M1002 VPWR B a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_47# C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=6.24e+11p pd=5.82e+06u as=4.485e+11p ps=3.98e+06u
-M1005 VGND D a_304_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.1525e+11p ps=2.27e+06u
-M1006 a_27_47# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1008 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_119_47# A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1013 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_304_47# C a_198_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR C a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR A a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_119_47# B a_198_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_304_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_27_47# A a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_27_47# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_198_47# C a_304_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_27_47# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_1.cdl b/cells/and4b/sky130_fd_sc_hdll__and4b_1.cdl
index c84dc46..907c446 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_1.cdl
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__and4b_1 A_N B C D VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 y D VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB phighvt m=1 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and4b_1
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_1.netlist.tsv b/cells/and4b/sky130_fd_sc_hdll__and4b_1.netlist.tsv
index 2a52fa5..8fe979b 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_1.netlist.tsv
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	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.65	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_1.spice b/cells/and4b/sky130_fd_sc_hdll__and4b_1.spice
index 4503d8f..d50b2b0 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_1.spice
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__and4b_1 A_N B C D VGND VNB VPB VPWR X
-M1000 a_379_47# B a_307_47# VNB nshort w=420000u l=150000u
-+  ad=2.1e+11p pd=1.84e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR A_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=7.115e+11p pd=6.35e+06u as=1.134e+11p ps=1.38e+06u
-M1002 a_509_47# C a_379_47# VNB nshort w=420000u l=150000u
-+  ad=1.491e+11p pd=1.55e+06u as=0p ps=0u
-M1003 X a_213_413# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=3.422e+11p ps=3.43e+06u
-M1004 VPWR B a_213_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=3.171e+11p ps=3.19e+06u
-M1005 VGND D a_509_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_213_413# a_27_47# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_213_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1008 VGND A_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1009 a_213_413# C VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR D a_213_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_307_47# a_27_47# a_213_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
+X0 a_213_413# a_27_47# a_307_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_27_47# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 VPWR C a_213_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 VPWR a_213_413# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_213_413# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 a_213_413# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 VGND a_213_413# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_27_47# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_27_47# a_213_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X9 a_307_47# B a_379_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_379_47# C a_509_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_509_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_2.cdl b/cells/and4b/sky130_fd_sc_hdll__and4b_2.cdl
index cdf835d..72de73b 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_2.cdl
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__and4b_2 A_N B C D VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 y D VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB phighvt m=2 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and4b_2
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_2.netlist.tsv b/cells/and4b/sky130_fd_sc_hdll__and4b_2.netlist.tsv
index bb60d23..206a417 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_2.netlist.tsv
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	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.65	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_2.spice b/cells/and4b/sky130_fd_sc_hdll__and4b_2.spice
index e6b10c2..94381c0 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_2.spice
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_hdll__and4b_2 A_N B C D VGND VNB VPB VPWR X
-M1000 VPWR D a_211_413# VPB phighvt w=420000u l=180000u
-+  ad=8.563e+11p pd=8.28e+06u as=4.683e+11p ps=3.91e+06u
-M1001 VPWR A_N a_27_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1002 VGND D a_519_47# VNB nshort w=420000u l=150000u
-+  ad=5.3965e+11p pd=5.38e+06u as=1.449e+11p ps=1.53e+06u
-M1003 VGND a_211_413# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.3075e+11p ps=2.01e+06u
-M1004 X a_211_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.25e+11p pd=2.65e+06u as=0p ps=0u
-M1005 a_399_47# B a_317_47# VNB nshort w=420000u l=150000u
-+  ad=1.89e+11p pd=1.74e+06u as=1.092e+11p ps=1.36e+06u
-M1006 VPWR B a_211_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_211_413# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_413# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1009 a_211_413# C VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_317_47# a_27_413# a_211_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1011 a_211_413# a_27_413# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_211_413# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_519_47# C a_399_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_413# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VGND a_211_413# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VPWR a_211_413# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_317_47# B a_399_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 X a_211_413# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 X a_211_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VPWR a_27_413# a_211_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 a_519_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND A_N a_27_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_399_47# C a_519_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_211_413# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X11 VPWR C a_211_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X12 a_211_413# a_27_413# a_317_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_211_413# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_4.cdl b/cells/and4b/sky130_fd_sc_hdll__and4b_4.cdl
index b0dce79..b64963a 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_4.cdl
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__and4b_4 A_N B C D VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB 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
-MMP1 y B 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
-MMP2 y C 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
-MMP3 y D 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 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.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + 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
+MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and4b_4
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_4.netlist.tsv b/cells/and4b/sky130_fd_sc_hdll__and4b_4.netlist.tsv
index 5358a99..f422896 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_4.netlist.tsv
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_4.spice b/cells/and4b/sky130_fd_sc_hdll__and4b_4.spice
index 861c6a9..ce0be05 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_4.spice
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_hdll__and4b_4 A_N B C D VGND VNB VPB VPWR X
-M1000 a_184_21# a_27_47# a_814_47# VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=2.47e+11p ps=2.06e+06u
-M1001 a_718_47# C a_624_47# VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=2.08e+11p ps=1.94e+06u
-M1002 a_624_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.205e+11p ps=6.17e+06u
-M1003 VPWR A_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=1.6157e+12p pd=1.333e+07u as=1.134e+11p ps=1.38e+06u
-M1004 a_184_21# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6.4e+11p pd=5.28e+06u as=0p ps=0u
-M1005 a_814_47# B a_718_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_184_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1007 X a_184_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_184_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1009 VPWR C a_184_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_184_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_184_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_27_47# a_184_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1014 VGND a_184_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_184_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_184_21# D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_184_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_47# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VGND a_184_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_718_47# B a_814_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR a_184_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND a_184_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_624_47# C a_718_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_184_21# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VPWR D a_184_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 X a_184_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND D a_624_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VPWR a_184_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_27_47# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 X a_184_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_184_21# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_814_47# a_27_47# a_184_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 X a_184_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 X a_184_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VPWR B a_184_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.cdl b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.cdl
index a0cded8..c47a221 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.cdl
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_hdll__and4bb_1 A_N B_N C D VGND VNB VPB VPWR X
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 y D VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=0.42 l=0.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and4bb_1
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.netlist.tsv b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.netlist.tsv
index 20bc12c..67d1c22 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.netlist.tsv
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	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.65	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.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.spice b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.spice
index b4f5100..1d03528 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.spice
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_hdll__and4bb_1 A_N B_N C D VGND VNB VPB VPWR X
-M1000 a_425_93# a_27_47# a_339_93# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.176e+11p ps=1.4e+06u
-M1001 a_615_93# C a_511_93# VNB nshort w=420000u l=150000u
-+  ad=1.89e+11p pd=1.74e+06u as=1.554e+11p ps=1.58e+06u
-M1002 a_339_93# C VPWR VPB phighvt w=420000u l=180000u
-+  ad=2.814e+11p pd=3.02e+06u as=6.779e+11p ps=7.03e+06u
-M1003 a_511_93# a_225_413# a_425_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_225_413# B_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1005 VPWR a_225_413# a_339_93# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR D a_339_93# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_225_413# B_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=3.861e+11p ps=3.65e+06u
-M1008 VGND A_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1009 VGND D a_615_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_339_93# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1011 VPWR A_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
-M1012 a_339_93# a_27_47# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_339_93# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
+X0 a_615_93# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_511_93# C a_615_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND a_339_93# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR C a_339_93# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 a_339_93# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 VPWR B_N a_225_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 a_339_93# a_27_47# a_425_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_425_93# a_225_413# a_511_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_27_47# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_339_93# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_27_47# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X11 VPWR a_27_47# a_339_93# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X12 a_339_93# a_225_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X13 VGND B_N a_225_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.cdl b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.cdl
index aa32bc7..09fd873 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.cdl
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_hdll__and4bb_2 A_N B_N C D VGND VNB VPB VPWR X
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 y D VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=0.42 l=0.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and4bb_2
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.netlist.tsv b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.netlist.tsv
index 60b84b3..232f846 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.netlist.tsv
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	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.65	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.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.spice b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.spice
index 0183273..d7ca9b8 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.spice
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__and4bb_2 A_N B_N C D VGND VNB VPB VPWR X
-M1000 a_503_47# a_27_47# a_184_21# VNB nshort w=420000u l=150000u
-+  ad=1.449e+11p pd=1.53e+06u as=1.092e+11p ps=1.36e+06u
-M1001 VPWR D a_184_21# VPB phighvt w=420000u l=180000u
-+  ad=1.299e+12p pd=9.38e+06u as=2.562e+11p ps=2.9e+06u
-M1002 VPWR A_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1003 a_184_21# C VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_602_47# a_545_280# a_503_47# VNB nshort w=420000u l=150000u
-+  ad=1.407e+11p pd=1.51e+06u as=0p ps=0u
-M1005 VGND D a_699_47# VNB nshort w=420000u l=150000u
-+  ad=6.1255e+11p pd=5.76e+06u as=1.134e+11p ps=1.38e+06u
-M1006 a_699_47# C a_602_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_545_280# B_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1008 a_184_21# a_27_47# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_545_280# a_184_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_184_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1011 VGND A_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1012 VGND a_184_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1013 X a_184_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_545_280# B_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1015 X a_184_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_47# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VGND a_184_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_602_47# C a_699_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_184_21# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 VPWR a_27_47# a_184_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 VGND B_N a_545_280# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 X a_184_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_503_47# a_545_280# a_602_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_184_21# a_27_47# a_503_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_184_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_27_47# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_184_21# a_545_280# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X12 VPWR C a_184_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X13 X a_184_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VPWR B_N a_545_280# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X15 a_699_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.cdl b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.cdl
index 2510e1b..8a9eafd 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.cdl
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_hdll__and4bb_4 A_N B_N C D VGND VNB VPB VPWR X
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB 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
-MMP1 y B 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
-MMP2 y C 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
-MMP3 y D 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 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.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and4bb_4
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.netlist.tsv b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.netlist.tsv
index c2bbf3a..d1dc9f6 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.netlist.tsv
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.spice b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.spice
index 1091c2b..a33b373 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.spice
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__and4bb_4 A_N B_N C D VGND VNB VPB VPWR X
-M1000 a_606_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=2.6975e+11p pd=2.13e+06u as=8.552e+11p ps=7.75e+06u
-M1001 a_912_21# A_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=1.9814e+12p ps=1.503e+07u
-M1002 VPWR B_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1003 a_184_21# a_912_21# a_836_47# VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=2.47e+11p ps=2.06e+06u
-M1004 a_184_21# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=7.35e+11p pd=5.47e+06u as=0p ps=0u
-M1005 VGND a_184_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1006 VPWR C a_184_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_184_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_184_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1009 a_836_47# a_27_47# a_719_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.8275e+11p ps=2.17e+06u
-M1010 X a_184_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_184_21# D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_912_21# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1013 VPWR a_184_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1015 VGND a_184_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_184_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_719_47# C a_606_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_912_21# a_184_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_184_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_47# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VGND a_184_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VPWR a_27_47# a_184_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VPWR a_184_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND a_184_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_184_21# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND A_N a_912_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR A_N a_912_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X8 VGND D a_606_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_836_47# a_912_21# a_184_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 X a_184_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VPWR a_184_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_27_47# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_719_47# a_27_47# a_836_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 X a_184_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 X a_184_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VPWR D a_184_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 X a_184_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 a_184_21# a_912_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_606_47# C a_719_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_1.cdl b/cells/buf/sky130_fd_sc_hdll__buf_1.cdl
index 81edbfa..d3627e6 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_1.cdl
+++ b/cells/buf/sky130_fd_sc_hdll__buf_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__buf_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phighvt m=1 w=0.79 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB phighvt m=1 w=0.79 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=0.79 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPB pfet_01v8_hvt m=1 w=0.79 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__buf_1
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_1.netlist.tsv b/cells/buf/sky130_fd_sc_hdll__buf_1.netlist.tsv
index b8312c0..86d3691 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_1.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_hdll__buf_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__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.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	0.79	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	1	0.79	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.52	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.79	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	1	0.79	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_1.spice b/cells/buf/sky130_fd_sc_hdll__buf_1.spice
index 7f8985d..b413215 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_1.spice
+++ b/cells/buf/sky130_fd_sc_hdll__buf_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_hdll__buf_1 A VGND VNB VPB VPWR X
-M1000 VPWR A a_27_47# VPB phighvt w=790000u l=180000u
-+  ad=2.449e+11p pd=2.2e+06u as=2.133e+11p ps=2.12e+06u
-M1001 X a_27_47# VPWR VPB phighvt w=790000u l=180000u
-+  ad=2.133e+11p pd=2.12e+06u as=0p ps=0u
-M1002 VGND A a_27_47# VNB nshort w=520000u l=150000u
-+  ad=1.768e+11p pd=1.72e+06u as=1.612e+11p ps=1.66e+06u
-M1003 X a_27_47# VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
+X0 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=790000u l=180000u
+X1 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X2 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X3 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=790000u l=180000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_12.cdl b/cells/buf/sky130_fd_sc_hdll__buf_12.cdl
index d149c96..10c371e 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_12.cdl
+++ b/cells/buf/sky130_fd_sc_hdll__buf_12.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__buf_12 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=12 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=12 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Ab A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB phighvt m=12 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__buf_12
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_12.netlist.tsv b/cells/buf/sky130_fd_sc_hdll__buf_12.netlist.tsv
index af68edb..e960eda 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_12.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_hdll__buf_12.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__buf_12	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	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	12	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	12	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	12	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	12	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_12.spice b/cells/buf/sky130_fd_sc_hdll__buf_12.spice
index 9888d87..42a2611 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_12.spice
+++ b/cells/buf/sky130_fd_sc_hdll__buf_12.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hdll__buf_12 A VGND VNB VPB VPWR X
-M1000 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=2.61e+12p pd=2.322e+07u as=1.74e+12p ps=1.548e+07u
-M1001 VPWR A a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1002 VGND A a_117_297# VNB nshort w=650000u l=150000u
-+  ad=1.82e+12p pd=1.73e+07u as=4.16e+11p ps=3.88e+06u
-M1003 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.2805e+12p ps=1.174e+07u
-M1007 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_117_297# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A a_117_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_117_297# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND A a_117_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VPWR A a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_117_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_117_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VPWR A a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_117_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VGND A a_117_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_117_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_16.cdl b/cells/buf/sky130_fd_sc_hdll__buf_16.cdl
index 201c252..773224b 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_16.cdl
+++ b/cells/buf/sky130_fd_sc_hdll__buf_16.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__buf_16 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nshort m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phighvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Ab A VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB phighvt m=16 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__buf_16
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_16.netlist.tsv b/cells/buf/sky130_fd_sc_hdll__buf_16.netlist.tsv
index dcb9859..2f9b2d2 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_16.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_hdll__buf_16.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	16	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	16	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	16	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	16	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_16.spice b/cells/buf/sky130_fd_sc_hdll__buf_16.spice
index 1b31a00..5a1491b 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_16.spice
+++ b/cells/buf/sky130_fd_sc_hdll__buf_16.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_hdll__buf_16 A VGND VNB VPB VPWR X
-M1000 VPWR a_109_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=3.44e+12p pd=3.088e+07u as=2.32e+12p ps=2.064e+07u
-M1001 VPWR A a_109_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.7e+11p ps=7.74e+06u
-M1002 VPWR a_109_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_109_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_109_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_109_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.6965e+12p pd=1.562e+07u as=2.3855e+12p ps=2.294e+07u
-M1006 VGND a_109_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_109_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_109_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_109_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_109_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_109_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=6.565e+11p pd=5.92e+06u as=0p ps=0u
-M1012 X a_109_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_109_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_109_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_109_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_109_47# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_109_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_109_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_109_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_109_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_109_47# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_109_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_109_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_109_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_109_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_109_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND A a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND a_109_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A a_109_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_109_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 X a_109_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 X a_109_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND a_109_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR a_109_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_109_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_109_47# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_109_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND A a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 X a_109_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 X a_109_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 X a_109_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 X a_109_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_109_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR a_109_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 X a_109_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 X a_109_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 X a_109_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 X a_109_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 X a_109_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 X a_109_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 X a_109_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VPWR a_109_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VGND A a_109_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VGND a_109_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VPWR A a_109_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 X a_109_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 X a_109_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VGND A a_109_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VGND a_109_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_109_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VPWR A a_109_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 VPWR a_109_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VPWR a_109_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VGND a_109_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 VGND a_109_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VGND a_109_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 a_109_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 VPWR a_109_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 VPWR a_109_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 VGND a_109_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X28 X a_109_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 X a_109_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 VGND a_109_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 a_109_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X32 X a_109_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 a_109_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X34 VPWR a_109_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 X a_109_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X36 VGND A a_109_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X37 X a_109_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X38 VPWR a_109_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X39 a_109_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X40 VGND a_109_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X41 X a_109_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X42 a_109_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X43 X a_109_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_2.cdl b/cells/buf/sky130_fd_sc_hdll__buf_2.cdl
index 4299918..6a80e8a 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_2.cdl
+++ b/cells/buf/sky130_fd_sc_hdll__buf_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__buf_2 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__buf_2
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_2.netlist.tsv b/cells/buf/sky130_fd_sc_hdll__buf_2.netlist.tsv
index d9109c2..3404c7d 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_2.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_hdll__buf_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__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.65	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	2	1.0	0.18	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.65	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_2.spice b/cells/buf/sky130_fd_sc_hdll__buf_2.spice
index 0bec7eb..f7de962 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_2.spice
+++ b/cells/buf/sky130_fd_sc_hdll__buf_2.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hdll__buf_2 A VGND VNB VPB VPWR X
-M1000 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=4.4425e+11p pd=4.02e+06u as=1.302e+11p ps=1.46e+06u
-M1001 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=3.0875e+11p pd=2.25e+06u as=0p ps=0u
-M1002 VPWR A a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=7.094e+11p pd=5.48e+06u as=1.728e+11p ps=1.82e+06u
-M1003 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.95e+11p pd=2.79e+06u as=0p ps=0u
-M1004 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X3 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_4.cdl b/cells/buf/sky130_fd_sc_hdll__buf_4.cdl
index 96d0080..2eafd4e 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_4.cdl
+++ b/cells/buf/sky130_fd_sc_hdll__buf_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__buf_4 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X Ab VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__buf_4
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_4.netlist.tsv b/cells/buf/sky130_fd_sc_hdll__buf_4.netlist.tsv
index 142cae1..5ca6c54 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_4.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_hdll__buf_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_4.spice b/cells/buf/sky130_fd_sc_hdll__buf_4.spice
index e9b2de3..71a94a0 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_4.spice
+++ b/cells/buf/sky130_fd_sc_hdll__buf_4.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__buf_4 A VGND VNB VPB VPWR X
-M1000 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=8.5e+11p ps=7.7e+06u
-M1001 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=5.85e+11p ps=5.7e+06u
-M1002 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1003 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1007 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_6.cdl b/cells/buf/sky130_fd_sc_hdll__buf_6.cdl
index 1778f41..d64dd78 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_6.cdl
+++ b/cells/buf/sky130_fd_sc_hdll__buf_6.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__buf_6 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Ab A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB phighvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X Ab VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__buf_6
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_6.netlist.tsv b/cells/buf/sky130_fd_sc_hdll__buf_6.netlist.tsv
index 79f5abc..644dfa0 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_6.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_hdll__buf_6.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__buf_6	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	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_6.spice b/cells/buf/sky130_fd_sc_hdll__buf_6.spice
index b4becb9..65b3bfa 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_6.spice
+++ b/cells/buf/sky130_fd_sc_hdll__buf_6.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__buf_6 A VGND VNB VPB VPWR X
-M1000 VGND a_169_297# X VNB nshort w=650000u l=150000u
-+  ad=9.62e+11p pd=9.46e+06u as=6.565e+11p ps=5.92e+06u
-M1001 VPWR A a_169_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.41e+12p pd=1.282e+07u as=2.9e+11p ps=2.58e+06u
-M1002 a_169_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_169_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.7e+11p ps=7.74e+06u
-M1004 X a_169_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_169_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_169_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A a_169_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1008 VPWR a_169_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_169_297# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_169_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_169_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_169_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_169_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_169_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_169_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_169_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_169_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VGND a_169_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_169_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND a_169_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 X a_169_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 X a_169_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VPWR a_169_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 X a_169_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR a_169_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VPWR A a_169_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 X a_169_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VGND A a_169_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 X a_169_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 X a_169_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VGND a_169_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_8.cdl b/cells/buf/sky130_fd_sc_hdll__buf_8.cdl
index 45c3aaf..f65ea5d 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_8.cdl
+++ b/cells/buf/sky130_fd_sc_hdll__buf_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__buf_8 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nshort m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phighvt m=3 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Ab A VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X Ab VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__buf_8
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_8.netlist.tsv b/cells/buf/sky130_fd_sc_hdll__buf_8.netlist.tsv
index 7891766..e5a0335 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_8.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_hdll__buf_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	3	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	3	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	8	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_8.spice b/cells/buf/sky130_fd_sc_hdll__buf_8.spice
index 064c135..4821283 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_8.spice
+++ b/cells/buf/sky130_fd_sc_hdll__buf_8.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_hdll__buf_8 A VGND VNB VPB VPWR X
-M1000 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=1.72e+12p ps=1.544e+07u
-M1001 a_27_47# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1002 a_27_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=4.095e+11p pd=3.86e+06u as=1.1765e+12p ps=1.142e+07u
-M1003 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=8.645e+11p pd=7.86e+06u as=0p ps=0u
-M1005 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VGND A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 VPWR A a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.cdl b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.cdl
index 19c0e8a..2a70963 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.cdl
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__bufbuf_16 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Abb Ab VNB nshort m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 Abb Ab VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 Abbb Abb VNB nshort m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 Abbb Abb VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X Abbb VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X Abbb VNB nshort m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP4 X Abbb VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X Abbb VPB phighvt m=16 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB 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
-MMIP2 Abb Ab VPB phighvt m=3 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 Abbb Abb VPB phighvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 Abb Ab VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 Abbb Abb VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__bufbuf_16
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.netlist.tsv b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.netlist.tsv
index 932245b..4857963 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.netlist.tsv
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Abb	Ab	VGND	VNB	nshort	3	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	Abbb	Abb	VGND	VNB	nshort	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	Abbb	VGND	VNB	nshort	16	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	Abbb	VPWR	VPB	phighvt	16	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Abb	Ab	VPWR	VPB	phighvt	3	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	Abbb	Abb	VPWR	VPB	phighvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	3	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	Abbb	Abb	VGND	VNB	nfet_01v8	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	Abbb	VGND	VNB	nfet_01v8	16	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	3	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	Abbb	Abb	VPWR	VPB	pfet_01v8_hvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.spice b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.spice
index 6cb2f1e..6062066 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.spice
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.spice
@@ -16,108 +16,56 @@
 
 
 .subckt sky130_fd_sc_hdll__bufbuf_16 A VGND VNB VPB VPWR X
-M1000 X a_589_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.32e+12p pd=2.064e+07u as=4.02e+12p ps=3.604e+07u
-M1001 VGND a_589_47# X VNB nshort w=650000u l=150000u
-+  ad=2.8015e+12p pd=2.682e+07u as=1.6965e+12p ps=1.562e+07u
-M1002 X a_589_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_589_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_589_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_225_47# a_589_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.7e+11p ps=7.74e+06u
-M1006 VGND a_589_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_589_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_225_47# a_589_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_589_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_589_47# a_225_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_589_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_589_47# a_225_47# VGND VNB nshort w=650000u l=150000u
-+  ad=6.565e+11p pd=5.92e+06u as=0p ps=0u
-M1013 X a_589_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_225_47# a_589_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_589_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_589_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_589_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_589_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_589_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_117_297# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.095e+11p ps=3.86e+06u
-M1021 X a_589_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1023 VGND a_225_47# a_589_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_589_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_589_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 X a_589_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_117_297# a_225_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.6e+11p ps=5.12e+06u
-M1028 VGND a_589_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_589_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 X a_589_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_589_47# a_225_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 X a_589_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_589_47# a_225_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 X a_589_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_225_47# a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 X a_589_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_117_297# A VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1038 a_225_47# a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_225_47# a_589_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VPWR a_589_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR a_589_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR a_117_297# a_225_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND a_589_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VPWR a_589_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_589_47# a_225_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VPWR a_589_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND a_225_47# a_589_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 X a_589_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 a_589_47# a_225_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 VGND a_117_297# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 VGND a_589_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_225_47# a_589_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR a_589_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_225_47# a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR a_589_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND a_589_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 X a_589_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND a_225_47# a_589_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 X a_589_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR a_117_297# a_225_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_589_47# a_225_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 X a_589_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_225_47# a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 X a_589_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VPWR A a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_589_47# a_225_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 X a_589_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_589_47# a_225_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 X a_589_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 X a_589_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_589_47# a_225_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 X a_589_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 X a_589_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_589_47# a_225_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VPWR a_589_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 VPWR a_589_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 X a_589_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 VPWR a_589_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 X a_589_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 VGND a_117_297# a_225_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 X a_589_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 VPWR a_225_47# a_589_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 VGND A a_117_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X32 X a_589_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X33 VGND a_589_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X34 X a_589_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X35 X a_589_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X36 VGND a_589_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X37 VPWR a_225_47# a_589_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X38 VGND a_589_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X39 a_225_47# a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X40 X a_589_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X41 VGND a_589_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X42 VPWR a_589_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X43 VGND a_225_47# a_589_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X44 VGND a_589_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X45 VPWR a_589_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X46 VPWR a_589_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X47 VGND a_589_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X48 a_589_47# a_225_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X49 a_225_47# a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X50 VGND a_225_47# a_589_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X51 VGND a_589_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.cdl b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.cdl
index 65bd872..e351e20 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.cdl
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__bufbuf_8 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 Abb Ab VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 Abbb Abb VNB nshort m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 Abbb Abb VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X Abbb VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X Abbb VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X Abbb VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 Abb Ab 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
-MI5 Abbb Abb VPB phighvt m=3 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X Abbb VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 Abbb Abb VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__bufbuf_8
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.netlist.tsv b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.netlist.tsv
index 7bf3e77..7941226 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.netlist.tsv
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	Abbb	Abb	VGND	VNB	nshort	3	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	Abbb	VGND	VNB	nshort	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	Abbb	VPWR	VPB	phighvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	Abbb	Abb	VPWR	VPB	phighvt	3	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	Abbb	Abb	VGND	VNB	nfet_01v8	3	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	Abbb	VGND	VNB	nfet_01v8	8	0.65	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.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	Abbb	Abb	VPWR	VPB	pfet_01v8_hvt	3	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.spice b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.spice
index 93a1653..6269d45 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.spice
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_hdll__bufbuf_8 A VGND VNB VPB VPWR X
-M1000 VPWR a_338_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=2.0444e+12p pd=1.815e+07u as=1.16e+12p ps=1.032e+07u
-M1001 VGND a_338_47# X VNB nshort w=650000u l=150000u
-+  ad=1.4095e+12p pd=1.349e+07u as=8.645e+11p ps=7.86e+06u
-M1002 VPWR a_338_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_338_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_338_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_224_297# a_338_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.095e+11p ps=3.86e+06u
-M1006 X a_338_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_338_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_338_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_224_297# a_338_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.6e+11p ps=5.12e+06u
-M1010 VPWR A a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1011 a_338_47# a_224_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_224_297# a_338_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_338_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_338_47# a_224_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_338_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_338_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_224_297# a_338_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1019 VPWR a_338_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_338_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_224_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1022 X a_338_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_338_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_224_297# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1025 X a_338_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_338_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 X a_338_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VGND a_224_297# a_338_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_338_47# a_224_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND a_338_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X6 VPWR a_224_297# a_338_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND a_27_47# a_224_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VGND a_338_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VGND a_338_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 X a_338_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_338_47# a_224_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VGND a_338_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VPWR a_338_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 X a_338_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_338_47# a_224_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_338_47# a_224_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 X a_338_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 VPWR a_27_47# a_224_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 X a_338_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 VPWR a_338_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 VPWR a_338_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 X a_338_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 X a_338_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 X a_338_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.cdl b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.cdl
index 2f9a6eb..627b284 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.cdl
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__bufinv_16 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Ab A VNB nshort m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Abb Ab VNB nshort m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 Abb Ab VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 Y Abb VNB nshort m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 Y Abb VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phighvt m=3 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Ab A VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 Abb Ab VPB phighvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 Y Abb VPB phighvt m=16 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 Abb Ab VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 Y Abb VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__bufinv_16
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.netlist.tsv b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.netlist.tsv
index a275bda..fb29b7f 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.netlist.tsv
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Abb	Ab	VGND	VNB	nshort	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	Y	Abb	VGND	VNB	nshort	16	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	3	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Abb	Ab	VPWR	VPB	phighvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	Y	Abb	VPWR	VPB	phighvt	16	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	3	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	Y	Abb	VGND	VNB	nfet_01v8	16	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	Y	Abb	VPWR	VPB	pfet_01v8_hvt	16	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.spice b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.spice
index 05e1157..2d06947 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.spice
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.spice
@@ -16,104 +16,54 @@
 
 
 .subckt sky130_fd_sc_hdll__bufinv_16 A VGND VNB VPB VPWR Y
-M1000 a_391_47# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=3.75e+12p ps=3.35e+07u
-M1001 a_27_47# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1002 Y a_391_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.32e+12p pd=2.064e+07u as=0p ps=0u
-M1003 Y a_391_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_391_47# Y VNB nshort w=650000u l=150000u
-+  ad=2.6e+12p pd=2.49e+07u as=1.6965e+12p ps=1.562e+07u
-M1005 VPWR a_27_47# a_391_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_391_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_391_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y a_391_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_391_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y a_391_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_391_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_391_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_391_47# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=4.095e+11p pd=3.86e+06u as=0p ps=0u
-M1015 VPWR a_391_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y a_391_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_391_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y a_391_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y a_391_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_391_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=6.565e+11p pd=5.92e+06u as=0p ps=0u
-M1022 Y a_391_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_27_47# a_391_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_27_47# a_391_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_391_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_391_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y a_391_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y a_391_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y a_391_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_391_47# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_391_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y a_391_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_391_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Y a_391_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR a_27_47# a_391_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_391_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Y a_391_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Y a_391_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_391_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND a_27_47# a_391_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_391_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VGND a_391_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VGND a_391_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VPWR a_391_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VPWR a_391_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 VGND a_27_47# a_391_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_391_47# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y a_391_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND a_27_47# a_391_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND a_391_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VPWR a_391_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VPWR a_391_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND a_391_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VPWR a_391_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND a_27_47# a_391_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VGND a_391_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_391_47# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 Y a_391_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 VPWR a_27_47# a_391_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VGND a_391_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 Y a_391_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_391_47# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 Y a_391_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 VPWR a_27_47# a_391_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 Y a_391_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 a_391_47# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 Y a_391_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 Y a_391_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 Y a_391_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 a_391_47# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 Y a_391_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X28 Y a_391_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 VGND A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 a_391_47# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 Y a_391_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 VPWR a_391_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 Y a_391_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X34 VPWR a_391_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 VGND a_27_47# a_391_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X36 VPWR a_391_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X37 Y a_391_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X38 VPWR A a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X39 Y a_391_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X40 VPWR a_391_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X41 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X42 VGND a_391_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X43 VPWR a_391_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X44 Y a_391_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X45 Y a_391_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X46 VGND a_391_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X47 VGND a_391_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X48 VPWR a_27_47# a_391_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X49 VGND a_391_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.cdl b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.cdl
index 004798d..7f831c2 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.cdl
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__bufinv_8 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Ab A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Abb Ab VNB nshort m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 Abb Ab VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 Y Abb VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 Y Abb VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 Abb Ab VPB phighvt m=3 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 Y Abb VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 Abb Ab VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 Y Abb VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__bufinv_8
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.netlist.tsv b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.netlist.tsv
index 4108be0..51436bb 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.netlist.tsv
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Abb	Ab	VGND	VNB	nshort	3	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	Y	Abb	VGND	VNB	nshort	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Abb	Ab	VPWR	VPB	phighvt	3	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	Y	Abb	VPWR	VPB	phighvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	3	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	Y	Abb	VGND	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	3	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	Y	Abb	VPWR	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.spice b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.spice
index 4e7d3c1..e961d0c 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.spice
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__bufinv_8 A VGND VNB VPB VPWR Y
-M1000 Y a_225_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=1.99e+12p ps=1.798e+07u
-M1001 VPWR a_225_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND a_225_47# Y VNB nshort w=650000u l=150000u
-+  ad=1.378e+12p pd=1.334e+07u as=8.645e+11p ps=7.86e+06u
-M1003 VPWR a_225_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y a_225_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y a_225_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_225_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_117_297# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.095e+11p ps=3.86e+06u
-M1008 Y a_225_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1010 VPWR a_117_297# a_225_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.6e+11p ps=5.12e+06u
-M1011 Y a_225_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y a_225_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_225_47# a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_225_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_117_297# A VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1016 a_225_47# a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_225_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_117_297# a_225_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_225_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y a_225_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_225_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y a_225_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_117_297# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_225_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_225_47# a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VGND a_225_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR a_117_297# a_225_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_225_47# a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VPWR A a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y a_225_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 Y a_225_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 Y a_225_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 Y a_225_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 Y a_225_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 Y a_225_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VGND a_117_297# a_225_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 Y a_225_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 VPWR a_225_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VGND A a_117_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VPWR a_225_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_225_47# a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VGND a_225_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 VGND a_225_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 VPWR a_225_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 Y a_225_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 a_225_47# a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VGND a_225_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.cdl b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.cdl
index 49eef28..fe1c8e6 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.cdl
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkbuf_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Ab A VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X Ab VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X Ab VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB phighvt m=1 w=0.79 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X Ab VPB phighvt m=1 w=0.79 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 Ab A VPB pfet_01v8_hvt m=1 w=0.79 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X Ab VPB pfet_01v8_hvt m=1 w=0.79 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkbuf_1
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.netlist.tsv b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.netlist.tsv
index e755a86..c828c12 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__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.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	Ab	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Ab	A	VPWR	VPB	phighvt	1	0.79	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	1	0.79	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.52	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.79	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	1	0.79	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.spice b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.spice
index c7c7804..d33270d 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.spice
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_hdll__clkbuf_1 A VGND VNB VPB VPWR X
-M1000 VPWR a_75_212# X VPB phighvt w=790000u l=180000u
-+  ad=5.293e+11p pd=2.92e+06u as=2.133e+11p ps=2.12e+06u
-M1001 a_75_212# A VGND w_233_n17# nshort w=520000u l=150000u
-+  ad=1.404e+11p pd=1.58e+06u as=3.38e+11p ps=2.34e+06u
-M1002 a_75_212# A VPWR VPB phighvt w=790000u l=180000u
-+  ad=2.133e+11p pd=2.12e+06u as=0p ps=0u
-M1003 VGND a_75_212# X w_233_n17# nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.612e+11p ps=1.66e+06u
+X0 X a_75_212# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=790000u l=180000u
+X1 VPWR A a_75_212# VPB sky130_fd_pr__pfet_01v8_hvt w=790000u l=180000u
+X2 X a_75_212# VGND SUBS sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X3 VGND A a_75_212# SUBS sky130_fd_pr__nfet_01v8 w=520000u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.cdl b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.cdl
index edb319b..88394fb 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.cdl
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkbuf_12 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB 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=12 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X Ab VNB nfet_01v8 m=12 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 Ab A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X Ab VPB phighvt m=12 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X Ab VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkbuf_12
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.netlist.tsv b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.netlist.tsv
index 8885e7a..18610cb 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__clkbuf_12	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	12	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	12	1.0	0.18	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	12	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	12	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.spice b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.spice
index cc6d0bb..3e16913 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.spice
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hdll__clkbuf_12 A VGND VNB VPB VPWR X
-M1000 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=2.57e+12p pd=2.314e+07u as=1.74e+12p ps=1.548e+07u
-M1001 X a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=6.804e+11p pd=8.28e+06u as=1.3482e+12p ps=1.398e+07u
-M1002 VPWR A a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1003 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_117_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A a_117_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.268e+11p ps=2.76e+06u
-M1010 X a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_117_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_117_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_117_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_117_297# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_117_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_117_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND A a_117_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 X a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_117_297# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND A a_117_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR A a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_117_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VPWR A a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_117_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VGND A a_117_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_117_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 a_117_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.cdl b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.cdl
index 4ef8186..5527788 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.cdl
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkbuf_16 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 Ab A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X Ab VPB phighvt m=16 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X Ab VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkbuf_16
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.netlist.tsv b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.netlist.tsv
index 620518b..5f5690a 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	16	1.0	0.18	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.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.spice b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.spice
index 001ce3d..2eed240 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.spice
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_hdll__clkbuf_16 A VGND VNB VPB VPWR X
-M1000 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=1.4679e+12p pd=1.623e+07u as=1.1298e+12p ps=1.21e+07u
-M1001 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.4e+12p pd=2.08e+07u as=3.245e+12p ps=2.849e+07u
-M1004 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_118_297# A VGND VNB nshort w=420000u l=150000u
-+  ad=2.772e+11p pd=3e+06u as=0p ps=0u
-M1007 VGND A a_118_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_118_297# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_118_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6e+11p pd=5.2e+06u as=0p ps=0u
-M1014 a_118_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A a_118_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A a_118_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR A a_118_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_118_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND A a_118_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_118_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 X a_118_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 X a_118_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_118_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR A a_118_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 X a_118_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 X a_118_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR a_118_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VGND A a_118_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND a_118_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 X a_118_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 X a_118_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_118_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VGND a_118_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_118_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_118_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VPWR a_118_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 X a_118_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 X a_118_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR a_118_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 VPWR a_118_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 X a_118_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 VGND a_118_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 X a_118_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VGND a_118_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 X a_118_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VPWR a_118_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 VGND a_118_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 X a_118_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 X a_118_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 VPWR a_118_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 VGND a_118_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 VGND a_118_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 X a_118_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 a_118_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X37 VPWR A a_118_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X38 X a_118_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 a_118_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.cdl b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.cdl
index dd9a9a1..26449c3 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.cdl
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkbuf_2 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X Ab VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkbuf_2
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.netlist.tsv b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.netlist.tsv
index e9e73d8..d3622f7 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	2	1.0	0.18	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.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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.spice b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.spice
index db958d6..149e51a 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.spice
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hdll__clkbuf_2 A VGND VNB VPB VPWR X
-M1000 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=2.457e+11p pd=2.85e+06u as=1.323e+11p ps=1.47e+06u
-M1001 VGND a_27_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.554e+11p ps=1.58e+06u
-M1002 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=6.15e+11p pd=5.23e+06u as=2.75e+11p ps=2.55e+06u
-M1003 X a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1005 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.cdl b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.cdl
index 5998456..d5ad0d4 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.cdl
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkbuf_4 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X Ab VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkbuf_4
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.netlist.tsv b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.netlist.tsv
index 8a10ce3..ca5796b 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	4	1.0	0.18	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.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.spice b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.spice
index 59d5371..c17cfe1 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.spice
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__clkbuf_4 A VGND VNB VPB VPWR X
-M1000 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=4.011e+11p pd=4.43e+06u as=1.323e+11p ps=1.47e+06u
-M1001 X a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=2.982e+11p pd=3.1e+06u as=0p ps=0u
-M1002 X a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=9.6e+11p pd=7.92e+06u as=2.75e+11p ps=2.55e+06u
-M1004 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=6e+11p ps=5.2e+06u
-M1005 VGND a_27_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_27_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u 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=1e+06u l=180000u
+X5 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.cdl b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.cdl
index 872848f..c6f23fb 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.cdl
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkbuf_6 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB 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=6 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X Ab VNB nfet_01v8 m=6 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 Ab A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X Ab VPB phighvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkbuf_6
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.netlist.tsv b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.netlist.tsv
index 5d59f9d..0e14a02 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__clkbuf_6	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	6	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	6	1.0	0.18	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	6	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.spice b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.spice
index 6cfbb3f..0437127 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.spice
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__clkbuf_6 A VGND VNB VPB VPWR X
-M1000 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.41e+12p pd=1.282e+07u as=8.7e+11p ps=7.74e+06u
-M1001 VPWR A a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1002 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A a_117_297# VNB nshort w=420000u l=150000u
-+  ad=7.245e+11p pd=7.65e+06u as=1.134e+11p ps=1.38e+06u
-M1005 X a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=3.423e+11p pd=4.15e+06u as=0p ps=0u
-M1006 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_117_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_117_297# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_117_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_117_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR A a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_117_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VGND A a_117_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_117_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.cdl b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.cdl
index a4f8d54..d5e44f9 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.cdl
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkbuf_8 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 Ab A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X Ab VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkbuf_8
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.netlist.tsv b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.netlist.tsv
index e9890b7..3933f32 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	8	1.0	0.18	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.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.spice b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.spice
index 4e2916f..2eff61e 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.spice
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__clkbuf_8 A VGND VNB VPB VPWR X
-M1000 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=7.791e+11p pd=8.75e+06u as=5.754e+11p ps=6.1e+06u
-M1001 a_118_297# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=0p ps=0u
-M1002 VGND A a_118_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.75e+12p pd=1.55e+07u as=1.2e+12p ps=1.04e+07u
-M1004 a_118_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1005 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_118_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A a_118_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_118_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A a_118_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 X a_118_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 X a_118_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND a_118_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_118_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_118_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND a_118_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_118_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VGND a_118_297# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 X a_118_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VPWR a_118_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 X a_118_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VPWR a_118_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 X a_118_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_118_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 VPWR a_118_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 X a_118_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 X a_118_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.cdl b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.cdl
index 79f177a..f6a892d 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.cdl
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkinv_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN0 Y A VNB 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.18 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8_hvt m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkinv_1
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.netlist.tsv b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.netlist.tsv
index 5f32f7a..96a320a 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hdll__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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.spice b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.spice
index 18ce131..2b63372 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.spice
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.spice
@@ -16,10 +16,7 @@
 
 
 .subckt sky130_fd_sc_hdll__clkinv_1 A VGND VNB VPB VPWR Y
-M1000 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.323e+11p ps=1.47e+06u
-M1001 Y A VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.436e+11p pd=2.26e+06u as=4.704e+11p ps=4.48e+06u
-M1002 VPWR A Y VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X1 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.cdl b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.cdl
index 4ef318b..1c01b46 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.cdl
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkinv_12 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP0 Y A VPB phighvt m=18 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8_hvt m=18 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 Y A VNB nshort m=12 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Y A VNB nfet_01v8 m=12 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkinv_12
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.netlist.tsv b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.netlist.tsv
index dc011d5..71c4e96 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hdll__clkinv_12	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	18	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	Y	A	VGND	VNB	nshort	12	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	18	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	12	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.spice b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.spice
index 6c139b7..a02fbfa 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.spice
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_hdll__clkinv_12 A VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=2.86e+12p pd=2.572e+07u as=2.61e+12p ps=2.322e+07u
-M1001 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=6.804e+11p pd=8.28e+06u as=1.323e+12p ps=1.218e+07u
-M1003 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  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 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  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 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+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=1e+06u l=180000u
+X7 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.cdl b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.cdl
index 9676892..51c48af 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.cdl
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkinv_16 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN0 Y A VNB 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8_hvt m=24 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkinv_16
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.netlist.tsv b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.netlist.tsv
index 7924609..34dd2d2 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hdll__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.0	0.18	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.spice b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.spice
index d17137f..716d2c2 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.spice
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_hdll__clkinv_16 A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=1.1739e+12p pd=1.231e+07u as=1.2285e+12p ps=1.341e+07u
-M1001 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=3.895e+12p pd=3.379e+07u as=3.755e+12p ps=3.151e+07u
-M1002 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  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=1e+06u l=180000u
-+  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 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  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 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND A Y 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=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  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 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X36 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X37 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.cdl b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.cdl
index 08e8347..934838b 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.cdl
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkinv_2 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN0 Y A VNB 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkinv_2
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.netlist.tsv b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.netlist.tsv
index 0b552ca..aa20091 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hdll__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.0	0.18	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.spice b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.spice
index c9a0d76..cceb03f 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.spice
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.spice
@@ -16,14 +16,9 @@
 
 
 .subckt sky130_fd_sc_hdll__clkinv_2 A VGND VNB VPB VPWR Y
-M1000 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=2.415e+11p pd=2.83e+06u as=1.386e+11p ps=1.5e+06u
-M1001 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.9e+11p pd=5.18e+06u as=5.75e+11p ps=5.15e+06u
-M1002 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 Y A VGND 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=180000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.cdl b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.cdl
index ddd9146..0bb90cf 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.cdl
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkinv_4 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN0 Y A VNB 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkinv_4
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.netlist.tsv b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.netlist.tsv
index 666f2a2..93e1f72 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hdll__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.0	0.18	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.spice b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.spice
index eb5065f..ee2ef21 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.spice
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__clkinv_4 A VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.27e+12p pd=1.054e+07u as=9e+11p ps=7.8e+06u
-M1001 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=2.772e+11p pd=3e+06u as=4.851e+11p ps=4.83e+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=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  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 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  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=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A Y 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=180000u
+X2 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.cdl b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.cdl
index 0fa6097..3df1388 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.cdl
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkinv_8 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN0 Y A VNB 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkinv_8
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.netlist.tsv b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.netlist.tsv
index a4f4070..b2b388f 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hdll__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.0	0.18	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.spice b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.spice
index 4b5e3e0..89a628e 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.spice
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__clkinv_8 A VGND VNB VPB VPWR Y
-M1000 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=7.014e+11p pd=7.54e+06u as=5.964e+11p ps=6.2e+06u
-M1001 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=2.095e+12p pd=1.819e+07u as=1.79e+12p ps=1.558e+07u
-M1002 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  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 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  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 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  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=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y A VGND 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 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+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 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.cdl b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.cdl
index 8cbbba9..ebf0cd5 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.cdl
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkinvlp_2 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP0 Y A VPB phighvt m=2 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net24 A VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net24 A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 Y A VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Y A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkinvlp_2
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.netlist.tsv b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.netlist.tsv
index f264319..e8f0796 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.netlist.tsv
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.netlist.tsv
@@ -1,5 +1,5 @@
 sky130_fd_sc_hdll__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
-MMIP0	MOSFET	Y	A	VPWR	VPB	phighvt	2	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net24	A	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	Y	A	net24	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	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
+MI5	MOSFET	net24	A	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Y	A	net24	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_hdll__clkinvlp_2.spice b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.spice
index eeaaa3a..fa9a207 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.spice
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_hdll__clkinvlp_2 A VGND VNB VPB VPWR Y
-M1000 Y A a_150_67# VNB nshort w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=1.98e+11p ps=1.82e+06u
-M1001 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=6.5e+11p pd=5.3e+06u as=2.8e+11p ps=2.56e+06u
-M1002 a_150_67# A VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1003 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y 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_150_67# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X3 a_150_67# A Y VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
 .ends
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.cdl b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.cdl
index a0e1741..aa39cca 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.cdl
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.cdl
@@ -16,14 +16,14 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkinvlp_4 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP0 Y A VPB phighvt m=4 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 Y A VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Y A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net35 A VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net35 A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net31 A VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net31 A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 Y A VNB 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
+MI5 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
 .ENDS sky130_fd_sc_hdll__clkinvlp_4
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.netlist.tsv b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.netlist.tsv
index 7f1c5d1..8334de6 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.netlist.tsv
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.netlist.tsv
@@ -1,7 +1,7 @@
 sky130_fd_sc_hdll__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
-MMIP0	MOSFET	Y	A	VPWR	VPB	phighvt	4	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	Y	A	net31	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net35	A	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net31	A	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	Y	A	net35	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	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
+MMIN0	MOSFET	Y	A	net31	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net35	A	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net31	A	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	Y	A	net35	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_hdll__clkinvlp_4.spice b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.spice
index 748820b..e73fd69 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.spice
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__clkinvlp_4 A VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.4e+11p pd=5.08e+06u as=7.9e+11p ps=7.58e+06u
-M1001 Y A a_110_47# VNB nshort w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=1.155e+11p ps=1.52e+06u
-M1002 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_110_47# A VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=2.8875e+11p ps=3.25e+06u
-M1004 VGND A a_268_47# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.52e+06u
-M1005 a_268_47# A Y VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_110_47# A Y VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X1 VGND A a_110_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 Y A a_268_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X4 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+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_268_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
 .ends
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.cdl b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.cdl
index 08bcb9e..f536ad1 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.cdl
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkmux2_1 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB 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.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB phighvt m=1 w=0.94 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB phighvt m=1 w=0.94 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB phighvt m=1 w=0.94 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB phighvt m=1 w=0.94 l=0.18 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.94 l=0.18 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 l=0.18 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.52 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X xb VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X xb VPB pfet_01v8_hvt m=1 w=1 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkmux2_1
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.netlist.tsv b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.netlist.tsv
index 44b62ea..a29b9b5 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.netlist.tsv
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__clkmux2_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.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	1	1	0.18	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.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8	1	0.52	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.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_01v8_hvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_01v8_hvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8_hvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	VPWR	VPB	pfet_01v8_hvt	1	1	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.spice b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.spice
index fb7e8cb..7dfe342 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.spice
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__clkmux2_1 A0 A1 S VGND VNB VPB VPWR X
-M1000 a_245_47# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=4.76e+11p ps=4.08e+06u
-M1001 a_478_47# A0 a_79_21# VNB nshort w=420000u l=150000u
-+  ad=3.591e+11p pd=2.55e+06u as=2.121e+11p ps=1.85e+06u
-M1002 a_79_21# A1 a_245_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=8.058e+11p pd=5.56e+06u as=2.7e+11p ps=2.54e+06u
-M1004 a_599_309# A1 a_79_21# VPB phighvt w=940000u l=180000u
-+  ad=2.444e+11p pd=2.4e+06u as=9.447e+11p ps=3.89e+06u
-M1005 a_243_309# S VPWR VPB phighvt w=940000u l=180000u
-+  ad=3.901e+11p pd=2.71e+06u as=0p ps=0u
-M1006 a_649_21# S VPWR VPB phighvt w=940000u l=180000u
-+  ad=2.726e+11p pd=2.46e+06u as=0p ps=0u
-M1007 a_649_21# S VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1008 VGND a_649_21# a_478_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_79_21# A0 a_243_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_649_21# a_599_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_79_21# X VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
+X0 VPWR S a_649_21# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X1 a_243_309# A0 a_79_21# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X2 X a_79_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VPWR S a_243_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X4 a_79_21# A1 a_599_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X5 VGND S a_649_21# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X6 a_79_21# A0 a_478_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_478_47# a_649_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND S a_245_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 X a_79_21# VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X10 a_245_47# A1 a_79_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_599_309# a_649_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
 .ends
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.cdl b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.cdl
index 199112c..3867500 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.cdl
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkmux2_2 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB 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.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB phighvt m=1 w=0.94 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB phighvt m=1 w=0.94 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB phighvt m=1 w=0.94 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB phighvt m=1 w=0.94 l=0.18 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.94 l=0.18 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 l=0.18 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.52 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X xb VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X xb VPB pfet_01v8_hvt m=2 w=1 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkmux2_2
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.netlist.tsv b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.netlist.tsv
index c9882fa..bc1bb94 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.netlist.tsv
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__clkmux2_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.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	2	1	0.18	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.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8	2	0.52	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.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_01v8_hvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_01v8_hvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8_hvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	VPWR	VPB	pfet_01v8_hvt	2	1	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.spice b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.spice
index 43a5e7f..118f33b 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.spice
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_hdll__clkmux2_2 A0 A1 S VGND VNB VPB VPWR X
-M1000 VPWR a_79_199# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.0664e+12p pd=8.08e+06u as=2.9e+11p ps=2.58e+06u
-M1001 VGND a_741_21# a_570_47# VNB nshort w=420000u l=150000u
-+  ad=6.32e+11p pd=5.72e+06u as=3.591e+11p ps=2.55e+06u
-M1002 a_335_309# S VPWR VPB phighvt w=940000u l=180000u
-+  ad=3.901e+11p pd=2.71e+06u as=0p ps=0u
-M1003 X a_79_199# VGND VNB nshort w=520000u l=150000u
-+  ad=1.404e+11p pd=1.58e+06u as=0p ps=0u
-M1004 a_741_21# S VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1005 X a_79_199# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_691_309# A1 a_79_199# VPB phighvt w=940000u l=180000u
-+  ad=2.444e+11p pd=2.4e+06u as=9.447e+11p ps=3.89e+06u
-M1007 a_570_47# A0 a_79_199# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.121e+11p ps=1.85e+06u
-M1008 a_337_47# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1009 a_741_21# S VPWR VPB phighvt w=940000u l=180000u
-+  ad=2.726e+11p pd=2.46e+06u as=0p ps=0u
-M1010 VGND a_79_199# X VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_79_199# A0 a_335_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_741_21# a_691_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_79_199# A1 a_337_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND S a_337_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_79_199# VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X2 a_337_47# A1 a_79_199# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_79_199# A1 a_691_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X4 VGND a_79_199# X VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X5 VPWR a_79_199# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_691_309# a_741_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X7 VPWR S a_335_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X8 VPWR S a_741_21# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X9 a_79_199# A0 a_570_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_335_309# A0 a_79_199# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X11 a_570_47# a_741_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 X a_79_199# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VGND S a_741_21# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
 .ends
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.cdl b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.cdl
index b76e691..078933d 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.cdl
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkmux2_4 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB 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.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB phighvt m=1 w=0.94 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB phighvt m=1 w=0.94 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB phighvt m=1 w=0.94 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB phighvt m=1 w=0.94 l=0.18 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.94 l=0.18 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=4 w=1 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+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.52 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X xb VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X xb VPB pfet_01v8_hvt m=4 w=1 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkmux2_4
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.netlist.tsv b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.netlist.tsv
index fc65fcd..d3e1418 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.netlist.tsv
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__clkmux2_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.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.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	4	1	0.18	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.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8	4	0.52	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.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_01v8_hvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_01v8_hvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8_hvt	1	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	VPWR	VPB	pfet_01v8_hvt	4	1	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.spice b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.spice
index 612dea1..83b0a55 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.spice
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_hdll__clkmux2_4 A0 A1 S VGND VNB VPB VPWR X
-M1000 VPWR a_79_199# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.3588e+12p pd=1.066e+07u as=5.8e+11p ps=5.16e+06u
-M1001 VGND a_925_21# a_754_47# VNB nshort w=420000u l=150000u
-+  ad=8.016e+11p pd=7.42e+06u as=3.591e+11p ps=2.55e+06u
-M1002 a_925_21# S VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1003 X a_79_199# VGND VNB nshort w=520000u l=150000u
-+  ad=2.808e+11p pd=3.16e+06u as=0p ps=0u
-M1004 X a_79_199# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_79_199# A1 a_525_47# VNB nshort w=420000u l=150000u
-+  ad=2.121e+11p pd=1.85e+06u as=1.428e+11p ps=1.52e+06u
-M1006 a_925_21# S VPWR VPB phighvt w=940000u l=180000u
-+  ad=2.726e+11p pd=2.46e+06u as=0p ps=0u
-M1007 a_875_309# A1 a_79_199# VPB phighvt w=940000u l=180000u
-+  ad=2.444e+11p pd=2.4e+06u as=9.447e+11p ps=3.89e+06u
-M1008 X a_79_199# VGND VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_754_47# A0 a_79_199# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_79_199# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_79_199# X VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_523_309# S VPWR VPB phighvt w=940000u l=180000u
-+  ad=3.713e+11p pd=2.67e+06u as=0p ps=0u
-M1013 a_79_199# A0 a_523_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_79_199# X VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_79_199# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_525_47# S VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_925_21# a_875_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR S a_523_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X1 X a_79_199# VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X2 a_523_309# A0 a_79_199# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X3 VGND a_79_199# X VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X4 a_79_199# A0 a_754_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR a_79_199# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_79_199# A1 a_875_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X7 a_754_47# a_925_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 X a_79_199# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR a_79_199# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 X a_79_199# VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X11 VGND S a_525_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_875_309# a_925_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X13 VGND a_79_199# X VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X14 X a_79_199# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VPWR S a_925_21# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X16 a_525_47# A1 a_79_199# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND S a_925_21# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
 .ends
diff --git a/cells/conb/sky130_fd_sc_hdll__conb_1.spice b/cells/conb/sky130_fd_sc_hdll__conb_1.spice
index 126b0e7..920dcde 100644
--- a/cells/conb/sky130_fd_sc_hdll__conb_1.spice
+++ b/cells/conb/sky130_fd_sc_hdll__conb_1.spice
@@ -16,6 +16,6 @@
 
 
 .subckt sky130_fd_sc_hdll__conb_1 VGND VNB VPB VPWR HI LO
-R0 VGND LO short w=480000u l=45000u
-R1 HI VPWR short w=480000u l=45000u
+X0 VGND LO VNB short w=480000u l=45000u
+X1 HI VPWR VNB short w=480000u l=45000u
 .ends
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_12.cdl b/cells/decap/sky130_fd_sc_hdll__decap_12.cdl
index 1af39a9..d52eec4 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_12.cdl
+++ b/cells/decap/sky130_fd_sc_hdll__decap_12.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__decap_12 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND VPWR VNB nshort m=1 w=0.55 l=4.73 mult=1 sa=0.265 sb=0.265
+MI1 VGND VPWR VNB nfet_01v8 m=1 w=0.55 l=4.73 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 VPWR VGND VPB phighvt m=1 w=0.87 l=4.73 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 VPWR VGND VPB pfet_01v8_hvt m=1 w=0.87 l=4.73 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__decap_12
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_12.netlist.tsv b/cells/decap/sky130_fd_sc_hdll__decap_12.netlist.tsv
index 3b7d12e..54e5412 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_12.netlist.tsv
+++ b/cells/decap/sky130_fd_sc_hdll__decap_12.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hdll__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	0.55	4.73	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	VPWR	VGND	VPWR	VPB	phighvt	1	0.87	4.73	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	VPWR	VGND	VNB	nfet_01v8	1	0.55	4.73	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	VPWR	VGND	VPWR	VPB	pfet_01v8_hvt	1	0.87	4.73	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_12.spice b/cells/decap/sky130_fd_sc_hdll__decap_12.spice
index 1c590d1..e884296 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_12.spice
+++ b/cells/decap/sky130_fd_sc_hdll__decap_12.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_hdll__decap_12 VGND VNB VPB VPWR
-M1000 VPWR VGND VPWR VPB phighvt w=870000u l=4.73e+06u
-+  ad=4.524e+11p pd=4.52e+06u as=0p ps=0u
-M1001 VGND VPWR VGND VNB nshort w=550000u l=4.73e+06u
-+  ad=2.86e+11p pd=3.24e+06u as=0p ps=0u
+X0 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=870000u l=4.73e+06u
+X1 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=4.73e+06u
 .ends
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_3.cdl b/cells/decap/sky130_fd_sc_hdll__decap_3.cdl
index b773c0f..c3ac3ab 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_3.cdl
+++ b/cells/decap/sky130_fd_sc_hdll__decap_3.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__decap_3 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND VPWR VNB nshort m=1 w=0.55 l=0.59 mult=1 sa=0.265 sb=0.265
+MI1 VGND VPWR VNB nfet_01v8 m=1 w=0.55 l=0.59 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 VPWR VGND VPB phighvt m=1 w=0.87 l=0.59 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 VPWR VGND VPB pfet_01v8_hvt m=1 w=0.87 l=0.59 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__decap_3
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_3.netlist.tsv b/cells/decap/sky130_fd_sc_hdll__decap_3.netlist.tsv
index fa8146b..a4bd70d 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_3.netlist.tsv
+++ b/cells/decap/sky130_fd_sc_hdll__decap_3.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hdll__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.59	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	VPWR	VGND	VPWR	VPB	phighvt	1	0.87	0.59	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	VPWR	VGND	VNB	nfet_01v8	1	0.55	0.59	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	VPWR	VGND	VPWR	VPB	pfet_01v8_hvt	1	0.87	0.59	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_3.spice b/cells/decap/sky130_fd_sc_hdll__decap_3.spice
index beb527b..fe7b526 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_3.spice
+++ b/cells/decap/sky130_fd_sc_hdll__decap_3.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_hdll__decap_3 VGND VNB VPB VPWR
-M1000 VPWR VGND VPWR VPB phighvt w=870000u l=590000u
-+  ad=4.524e+11p pd=4.52e+06u as=0p ps=0u
-M1001 VGND VPWR VGND VNB nshort w=550000u l=590000u
-+  ad=2.86e+11p pd=3.24e+06u as=0p ps=0u
+X0 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=870000u l=590000u
+X1 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=590000u
 .ends
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_4.cdl b/cells/decap/sky130_fd_sc_hdll__decap_4.cdl
index d2a2899..e86c193 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_4.cdl
+++ b/cells/decap/sky130_fd_sc_hdll__decap_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__decap_4 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI2 VPWR VGND VPB phighvt m=1 w=0.87 l=1.05 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 VGND VPWR VNB nshort m=1 w=0.55 l=1.05 mult=1 sa=0.265 sb=0.265
+MI2 VPWR VGND VPB pfet_01v8_hvt m=1 w=0.87 l=1.05 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI1 VGND VPWR VNB nfet_01v8 m=1 w=0.55 l=1.05 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__decap_4
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_4.netlist.tsv b/cells/decap/sky130_fd_sc_hdll__decap_4.netlist.tsv
index 768ac40..0c5b897 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_4.netlist.tsv
+++ b/cells/decap/sky130_fd_sc_hdll__decap_4.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hdll__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
-MI2	MOSFET	VPWR	VGND	VPWR	VPB	phighvt	1	0.87	1.05	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	VGND	VPWR	VGND	VNB	nshort	1	0.55	1.05	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	VPWR	VGND	VPWR	VPB	pfet_01v8_hvt	1	0.87	1.05	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	VPWR	VGND	VNB	nfet_01v8	1	0.55	1.05	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_4.spice b/cells/decap/sky130_fd_sc_hdll__decap_4.spice
index f249490..5d6e7cb 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_4.spice
+++ b/cells/decap/sky130_fd_sc_hdll__decap_4.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_hdll__decap_4 VGND VNB VPB VPWR
-M1000 VPWR VGND VPWR VPB phighvt w=870000u l=1.05e+06u
-+  ad=4.524e+11p pd=4.52e+06u as=0p ps=0u
-M1001 VGND VPWR VGND VNB nshort w=550000u l=1.05e+06u
-+  ad=2.86e+11p pd=3.24e+06u as=0p ps=0u
+X0 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=870000u l=1.05e+06u
+X1 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=1.05e+06u
 .ends
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_6.cdl b/cells/decap/sky130_fd_sc_hdll__decap_6.cdl
index e373ce7..56472c3 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_6.cdl
+++ b/cells/decap/sky130_fd_sc_hdll__decap_6.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__decap_6 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND VPWR VNB nshort m=1 w=0.55 l=1.97 mult=1 sa=0.265 sb=0.265
+MI1 VGND VPWR VNB nfet_01v8 m=1 w=0.55 l=1.97 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 VPWR VGND VPB phighvt m=1 w=0.87 l=1.97 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 VPWR VGND VPB pfet_01v8_hvt m=1 w=0.87 l=1.97 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__decap_6
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_6.netlist.tsv b/cells/decap/sky130_fd_sc_hdll__decap_6.netlist.tsv
index 043b14c..3cdda76 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_6.netlist.tsv
+++ b/cells/decap/sky130_fd_sc_hdll__decap_6.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hdll__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	0.55	1.97	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	VPWR	VGND	VPWR	VPB	phighvt	1	0.87	1.97	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	VPWR	VGND	VNB	nfet_01v8	1	0.55	1.97	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	VPWR	VGND	VPWR	VPB	pfet_01v8_hvt	1	0.87	1.97	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_6.spice b/cells/decap/sky130_fd_sc_hdll__decap_6.spice
index 73c7c2c..8ad2d2e 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_6.spice
+++ b/cells/decap/sky130_fd_sc_hdll__decap_6.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_hdll__decap_6 VGND VNB VPB VPWR
-M1000 VPWR VGND VPWR VPB phighvt w=870000u l=1.97e+06u
-+  ad=4.524e+11p pd=4.52e+06u as=0p ps=0u
-M1001 VGND VPWR VGND VNB nshort w=550000u l=1.97e+06u
-+  ad=2.86e+11p pd=3.24e+06u as=0p ps=0u
+X0 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=870000u l=1.97e+06u
+X1 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=1.97e+06u
 .ends
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_8.cdl b/cells/decap/sky130_fd_sc_hdll__decap_8.cdl
index 8d8c57c..30ffbe6 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_8.cdl
+++ b/cells/decap/sky130_fd_sc_hdll__decap_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__decap_8 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND VPWR VNB nshort m=1 w=0.55 l=2.89 mult=1 sa=0.265 sb=0.265
+MI1 VGND VPWR VNB nfet_01v8 m=1 w=0.55 l=2.89 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 VPWR VGND VPB phighvt m=1 w=0.87 l=2.89 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 VPWR VGND VPB pfet_01v8_hvt m=1 w=0.87 l=2.89 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__decap_8
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_8.netlist.tsv b/cells/decap/sky130_fd_sc_hdll__decap_8.netlist.tsv
index cd41e8d..3ba0ede 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_8.netlist.tsv
+++ b/cells/decap/sky130_fd_sc_hdll__decap_8.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hdll__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	0.55	2.89	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	VPWR	VGND	VPWR	VPB	phighvt	1	0.87	2.89	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	VPWR	VGND	VNB	nfet_01v8	1	0.55	2.89	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	VPWR	VGND	VPWR	VPB	pfet_01v8_hvt	1	0.87	2.89	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_8.spice b/cells/decap/sky130_fd_sc_hdll__decap_8.spice
index 8968797..6a91100 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_8.spice
+++ b/cells/decap/sky130_fd_sc_hdll__decap_8.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_hdll__decap_8 VGND VNB VPB VPWR
-M1000 VPWR VGND VPWR VPB phighvt w=870000u l=2.89e+06u
-+  ad=4.524e+11p pd=4.52e+06u as=0p ps=0u
-M1001 VGND VPWR VGND VNB nshort w=550000u l=2.89e+06u
-+  ad=2.86e+11p pd=3.24e+06u as=0p ps=0u
+X0 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=870000u l=2.89e+06u
+X1 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=2.89e+06u
 .ends
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.cdl b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.cdl
index 8827fd8..6335e56 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.cdl
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_hdll__dfrtp_1 CLK D RESET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI46 clkpos clkneg VNB 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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net82 s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net108 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net101 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net82 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net93 M1 VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net82 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net81 net82 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net108 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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
-MI649 M1 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI33 net101 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net165 net82 VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI34 net93 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net82 RESET_B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI653 Q net82 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net81 net82 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos 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
-MI658 net82 s0 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
-MI30 net144 M1 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
-MI31 M0 clkneg 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
-MI32 net144 RESET_B VPB phighvt m=1 w=0.42 l=0.18 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
-MI660 Q net82 VPB phighvt m=1 w=1.0 l=0.18 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
-MI45 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 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
-MI648 M1 M0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net165 net82 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net82 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net82 s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net144 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net144 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net82 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D 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
-MI650 M1 clkneg 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
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dfrtp_1
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.netlist.tsv b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.netlist.tsv
index 2521ae7..c5c0bfd 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.netlist.tsv
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_hdll__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.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net82	s0	net108	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net108	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net101	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	net93	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net93	M1	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net81	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net82	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net81	net82	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	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.36	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net165	net82	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net82	RESET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net165	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net82	s0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net144	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net144	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net144	RESET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net82	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	0.42	0.18	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.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net82	s0	net108	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net108	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net101	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	net93	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net93	M1	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net81	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net82	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net81	net82	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	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.36	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net165	net82	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net82	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net165	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net82	s0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net144	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net144	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net144	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net82	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.spice b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.spice
index cdbdde5..c3c7924 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.spice
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_hdll__dfrtp_1 CLK D RESET_B VGND VNB VPB VPWR Q
-M1000 a_436_413# D VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.428e+11p pd=1.52e+06u as=1.3145e+12p ps=1.289e+07u
-M1001 VPWR a_1323_21# a_1330_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=9.66e+10p ps=1.3e+06u
-M1002 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.1789e+12p ps=1.006e+07u
-M1003 Q a_1323_21# VGND VNB nshort w=650000u l=150000u
-+  ad=1.82e+11p pd=1.86e+06u as=0p ps=0u
-M1004 a_649_413# a_27_47# a_534_47# VPB phighvt w=420000u l=180000u
-+  ad=3.318e+11p pd=3.26e+06u as=1.533e+11p ps=1.57e+06u
-M1005 a_805_47# a_751_289# a_642_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.748e+11p ps=2.17e+06u
-M1006 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1007 VGND RESET_B a_805_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_436_413# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.338e+11p pd=1.5e+06u as=0p ps=0u
-M1009 VGND a_1323_21# a_1237_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.698e+11p ps=1.7e+06u
-M1010 VPWR a_751_289# a_649_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_751_289# a_534_47# VGND VNB nshort w=640000u l=150000u
-+  ad=1.998e+11p pd=1.97e+06u as=0p ps=0u
-M1012 Q a_1323_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1013 VPWR a_1128_47# a_1323_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1014 a_1128_47# a_211_363# a_751_289# VNB nshort w=360000u l=150000u
-+  ad=1.422e+11p pd=1.51e+06u as=0p ps=0u
-M1015 a_534_47# a_27_47# a_436_413# VNB nshort w=360000u l=150000u
-+  ad=1.404e+11p pd=1.5e+06u as=0p ps=0u
-M1016 a_751_289# a_534_47# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.709e+11p pd=2.41e+06u as=0p ps=0u
-M1017 a_1128_47# a_27_47# a_751_289# VPB phighvt w=420000u l=180000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1018 a_642_47# a_211_363# a_534_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1237_47# a_27_47# a_1128_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1542_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1021 a_1323_21# a_1128_47# a_1542_47# VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1022 a_649_413# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1024 a_1323_21# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1026 a_534_47# a_211_363# a_436_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1330_413# a_211_363# a_1128_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_436_413# a_211_363# a_534_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 a_1330_413# a_1323_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 VPWR a_1323_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_1237_47# a_1323_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR RESET_B a_649_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X6 a_436_413# a_27_47# a_534_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X7 a_649_413# a_751_289# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X8 a_1128_47# a_211_363# a_1330_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X9 a_534_47# a_211_363# a_642_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X10 a_751_289# a_211_363# a_1128_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X11 VGND a_27_47# a_211_363# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_751_289# a_27_47# a_1128_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X13 VGND D a_436_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VPWR D a_436_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X15 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_805_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1128_47# a_27_47# a_1237_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X18 VPWR a_27_47# a_211_363# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X19 VPWR a_534_47# a_751_289# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X20 VPWR RESET_B a_1323_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X21 VGND a_534_47# a_751_289# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 a_1323_21# a_1128_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X23 VGND a_1323_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 a_1542_47# a_1128_47# a_1323_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_534_47# a_27_47# a_649_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X26 VGND RESET_B a_1542_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_642_47# a_751_289# a_805_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.cdl b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.cdl
index c78e1d6..dee470b 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.cdl
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_hdll__dfrtp_2 CLK D RESET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI46 clkpos clkneg VNB 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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net82 s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net108 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net101 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net82 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net93 M1 VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net82 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net81 net82 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net108 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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
-MI649 M1 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI33 net101 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net165 net82 VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI34 net93 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net82 RESET_B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI653 Q net82 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net81 net82 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos 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
-MI658 net82 s0 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
-MI30 net144 M1 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
-MI31 M0 clkneg 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
-MI32 net144 RESET_B VPB phighvt m=1 w=0.42 l=0.18 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
-MI660 Q net82 VPB phighvt m=2 w=1.0 l=0.18 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
-MI45 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 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
-MI648 M1 M0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net165 net82 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net82 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net82 s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net144 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net144 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net82 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D 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
-MI650 M1 clkneg 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
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dfrtp_2
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.netlist.tsv b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.netlist.tsv
index 12cc7db..24e4a72 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.netlist.tsv
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_hdll__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.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net82	s0	net108	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net108	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net101	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	net93	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net93	M1	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net81	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net82	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net81	net82	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	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.36	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net165	net82	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net82	RESET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net165	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net82	s0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net144	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net144	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net144	RESET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net82	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	0.42	0.18	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.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net82	s0	net108	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net108	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net101	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	net93	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net93	M1	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net81	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net82	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net81	net82	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	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.36	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net165	net82	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net82	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net165	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net82	s0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net144	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net144	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net144	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net82	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.spice b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.spice
index 55ad721..7a03d14 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.spice
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_hdll__dfrtp_2 CLK D RESET_B VGND VNB VPB VPWR Q
-M1000 a_436_413# D VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.428e+11p pd=1.52e+06u as=1.5845e+12p ps=1.543e+07u
-M1001 VPWR a_1323_21# a_1330_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=9.66e+10p ps=1.3e+06u
-M1002 VPWR a_1323_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1003 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.3154e+12p ps=1.178e+07u
-M1004 a_649_413# a_27_47# a_534_47# VPB phighvt w=420000u l=180000u
-+  ad=3.318e+11p pd=3.26e+06u as=1.533e+11p ps=1.57e+06u
-M1005 a_805_47# a_751_289# a_642_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.748e+11p ps=2.17e+06u
-M1006 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1007 VGND RESET_B a_805_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_436_413# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.338e+11p pd=1.5e+06u as=0p ps=0u
-M1009 VGND a_1323_21# a_1237_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.698e+11p ps=1.7e+06u
-M1010 VPWR a_751_289# a_649_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_751_289# a_534_47# VGND VNB nshort w=640000u l=150000u
-+  ad=1.998e+11p pd=1.97e+06u as=0p ps=0u
-M1012 Q a_1323_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_1128_47# a_1323_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1014 a_1128_47# a_211_363# a_751_289# VNB nshort w=360000u l=150000u
-+  ad=1.422e+11p pd=1.51e+06u as=0p ps=0u
-M1015 a_534_47# a_27_47# a_436_413# VNB nshort w=360000u l=150000u
-+  ad=1.404e+11p pd=1.5e+06u as=0p ps=0u
-M1016 Q a_1323_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.405e+11p pd=2.04e+06u as=0p ps=0u
-M1017 a_751_289# a_534_47# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.709e+11p pd=2.41e+06u as=0p ps=0u
-M1018 a_1128_47# a_27_47# a_751_289# VPB phighvt w=420000u l=180000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1019 a_642_47# a_211_363# a_534_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1237_47# a_27_47# a_1128_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1542_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1022 a_1323_21# a_1128_47# a_1542_47# VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1023 a_649_413# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1025 a_1323_21# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_1323_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1028 a_534_47# a_211_363# a_436_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1330_413# a_211_363# a_1128_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_436_413# a_211_363# a_534_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 Q a_1323_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_1330_413# a_1323_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 VPWR a_1323_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_1237_47# a_1323_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR RESET_B a_649_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X7 a_436_413# a_27_47# a_534_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X8 Q a_1323_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_649_413# a_751_289# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X10 a_1128_47# a_211_363# a_1330_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X11 a_534_47# a_211_363# a_642_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X12 a_751_289# a_211_363# a_1128_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X13 VGND a_27_47# a_211_363# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_751_289# a_27_47# a_1128_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X15 VGND D a_436_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VPWR D a_436_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X17 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_805_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_1128_47# a_27_47# a_1237_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X20 VPWR a_27_47# a_211_363# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X21 VPWR a_534_47# a_751_289# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X22 VPWR RESET_B a_1323_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X23 VGND a_534_47# a_751_289# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 a_1323_21# a_1128_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X25 a_1542_47# a_1128_47# a_1323_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_534_47# a_27_47# a_649_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X27 VGND RESET_B a_1542_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_642_47# a_751_289# a_805_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VGND a_1323_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.cdl b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.cdl
index 6bc59d9..ddf95c6 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.cdl
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_hdll__dfrtp_4 CLK D RESET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI46 clkpos clkneg VNB 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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net82 s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net108 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net101 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net82 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net93 M1 VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net82 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net81 net82 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net108 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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
-MI649 M1 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI33 net101 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net165 net82 VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI34 net93 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net82 RESET_B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI653 Q net82 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net81 net82 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos 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
-MI658 net82 s0 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
-MI30 net144 M1 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
-MI31 M0 clkneg 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
-MI32 net144 RESET_B VPB phighvt m=1 w=0.42 l=0.18 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
-MI660 Q net82 VPB phighvt m=4 w=1.0 l=0.18 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
-MI45 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 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
-MI648 M1 M0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net165 net82 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net82 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net82 s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net144 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net144 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net82 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D 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
-MI650 M1 clkneg 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
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dfrtp_4
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.netlist.tsv b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.netlist.tsv
index 3be91b6..c74c284 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.netlist.tsv
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_hdll__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.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net82	s0	net108	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net108	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net101	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	net93	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net93	M1	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net81	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net82	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net81	net82	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	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.36	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net165	net82	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net82	RESET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net165	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net82	s0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net144	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net144	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net144	RESET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net82	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	0.42	0.18	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.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net82	s0	net108	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net108	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net101	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	net93	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net93	M1	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net81	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net82	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net81	net82	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	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.36	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net165	net82	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net82	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net165	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net82	s0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net144	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net144	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net144	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net82	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.spice b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.spice
index c266e93..645b1a2 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.spice
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_hdll__dfrtp_4 CLK D RESET_B VGND VNB VPB VPWR Q
-M1000 a_699_413# a_27_47# a_583_47# VPB phighvt w=420000u l=180000u
-+  ad=3.528e+11p pd=3.36e+06u as=1.533e+11p ps=1.57e+06u
-M1001 a_865_47# a_811_289# a_689_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.012e+11p ps=2.3e+06u
-M1002 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.5815e+12p ps=1.392e+07u
-M1003 VGND RESET_B a_865_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=1.8817e+12p pd=1.792e+07u as=1.728e+11p ps=1.82e+06u
-M1005 a_1188_47# a_211_363# a_811_289# VNB nshort w=360000u l=150000u
-+  ad=1.782e+11p pd=1.71e+06u as=1.998e+11p ps=1.97e+06u
-M1006 VPWR a_1403_21# a_1388_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.428e+11p ps=1.52e+06u
-M1007 a_583_47# a_27_47# a_468_47# VNB nshort w=360000u l=150000u
-+  ad=1.368e+11p pd=1.48e+06u as=1.71e+11p ps=1.69e+06u
-M1008 VGND a_1403_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1009 a_1388_413# a_211_363# a_1188_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.47e+11p ps=1.54e+06u
-M1010 VPWR a_1403_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1011 VPWR a_1188_47# a_1403_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1012 a_468_47# D VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1403_21# a_1188_47# a_1612_47# VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.491e+11p ps=1.55e+06u
-M1014 a_689_47# a_211_363# a_583_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_811_289# a_699_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Q a_1403_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1403_21# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_1403_21# a_1317_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.7e+06u
-M1019 VPWR a_1403_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1317_47# a_27_47# a_1188_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1022 a_811_289# a_583_47# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.709e+11p pd=2.41e+06u as=0p ps=0u
-M1023 Q a_1403_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_468_47# D VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.386e+11p pd=1.5e+06u as=0p ps=0u
-M1025 a_583_47# a_211_363# a_468_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Q a_1403_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1028 a_1188_47# a_27_47# a_811_289# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1612_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND a_1403_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Q a_1403_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_811_289# a_583_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_699_413# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1612_47# a_1188_47# a_1403_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_1403_21# a_1188_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 a_865_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_1188_47# a_27_47# a_1317_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X4 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X5 a_1317_47# a_1403_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_1403_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 Q a_1403_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VPWR RESET_B a_699_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X9 a_1188_47# a_211_363# a_1388_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X10 Q a_1403_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VGND a_27_47# a_211_363# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR RESET_B a_1403_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X13 a_699_413# a_811_289# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X14 a_689_47# a_811_289# a_865_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_811_289# a_27_47# a_1188_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X16 a_583_47# a_211_363# a_689_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X17 VPWR D a_468_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X18 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_468_47# a_27_47# a_583_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X20 VPWR a_1403_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VGND RESET_B a_1612_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 Q a_1403_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VPWR a_27_47# a_211_363# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X24 a_1388_413# a_1403_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X25 a_811_289# a_211_363# a_1188_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X26 VGND a_583_47# a_811_289# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X27 VGND a_1403_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X28 a_583_47# a_27_47# a_699_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X29 VGND D a_468_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_468_47# a_211_363# a_583_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X31 VPWR a_583_47# a_811_289# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X32 Q a_1403_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 VGND a_1403_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.cdl b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.cdl
index 97f0a99..d66746b 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.cdl
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_hdll__dfstp_1 CLK D SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI36 net120 M0 VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nshort m=1 w=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.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nshort m=1 w=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.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 net120 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 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.54 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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.36 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.65 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.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB 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
-MI37 net179 M0 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
-MI43 db clkpos 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
-MI45 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 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.18 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net156 M1 VPB phighvt m=1 w=0.42 l=0.18 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.18 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.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
+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.18 mult=1 sa=0.265 sb=0.265
+MI647 S1 S0 VNB nfet_01v8 m=1 w=0.54 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 S0 clkpos VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B 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
-MI648 S1 S0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB 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
-MI663 net128 S0 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net128 VPB 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
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net179 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net156 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net143 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net128 S0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net128 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dfstp_1
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.netlist.tsv b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.netlist.tsv
index c0fc95f..1dd969a 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.netlist.tsv
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_hdll__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.36	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.64	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.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
-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.54	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net100	VNB	nshort	1	0.36	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net179	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net179	M0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net156	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net156	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net143	S1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net143	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net128	S0	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net128	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net120	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.36	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.64	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.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
+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.54	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net100	VNB	nfet_01v8	1	0.36	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.65	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.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net179	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net179	M0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net128	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.spice b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.spice
index 2620bfd..0f8eb98 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.spice
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hdll__dfstp_1 CLK D SET_B VGND VNB VPB VPWR Q
-M1000 VPWR SET_B a_1126_413# VPB phighvt w=420000u l=180000u
-+  ad=1.3883e+12p pd=1.359e+07u as=2.856e+11p ps=3.04e+06u
-M1001 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.18655e+12p ps=1.1e+07u
-M1002 a_506_47# a_27_47# a_409_329# VNB nshort w=360000u l=150000u
-+  ad=1.8e+11p pd=1.72e+06u as=1.87e+11p ps=1.93e+06u
-M1003 Q a_1738_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.2e+11p pd=2.64e+06u as=0p ps=0u
-M1004 a_1344_47# a_27_47# a_1126_413# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.596e+11p ps=1.6e+06u
-M1005 VGND a_1126_413# a_1738_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1006 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1007 VPWR a_1126_413# a_1738_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1008 VPWR a_702_21# a_610_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.974e+11p ps=1.78e+06u
-M1009 Q a_1738_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.9825e+11p pd=1.91e+06u as=0p ps=0u
-M1010 VPWR a_1288_261# a_1244_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=9.66e+10p ps=1.3e+06u
-M1011 a_1126_413# a_211_363# a_1156_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1012 a_1044_413# a_506_47# VPWR VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=0p ps=0u
-M1013 a_409_329# D VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_409_329# D VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.625e+11p pd=2.39e+06u as=0p ps=0u
-M1015 a_1156_47# a_506_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_636_47# a_211_363# a_506_47# VNB nshort w=360000u l=150000u
-+  ad=1.341e+11p pd=1.5e+06u as=0p ps=0u
-M1017 VPWR a_506_47# a_702_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1018 a_1288_261# a_1126_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1019 a_610_413# a_27_47# a_506_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1020 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1021 a_866_47# SET_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1022 VGND a_702_21# a_636_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1288_261# a_1126_413# VGND VNB nshort w=540000u l=150000u
-+  ad=1.404e+11p pd=1.6e+06u as=0p ps=0u
-M1024 a_1244_413# a_211_363# a_1126_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_702_21# a_506_47# a_866_47# VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1026 a_702_21# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1028 a_506_47# a_211_363# a_409_329# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1416_47# a_1288_261# a_1344_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1030 a_1126_413# a_27_47# a_1044_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND SET_B a_1416_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1126_413# a_27_47# a_1344_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR SET_B a_702_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 VPWR a_506_47# a_1044_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 a_1244_413# a_1288_261# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 VGND SET_B a_866_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_1344_47# a_1288_261# a_1416_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_1126_413# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X8 a_636_47# a_702_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR D a_409_329# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X10 VPWR a_1126_413# a_1288_261# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X11 VGND D a_409_329# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_1738_47# a_1126_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X13 a_506_47# a_211_363# a_636_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X14 VGND a_27_47# a_211_363# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_1156_47# a_211_363# a_1126_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_506_47# a_27_47# a_610_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X17 a_610_413# a_702_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X18 a_1126_413# a_211_363# a_1244_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X19 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_1044_413# a_27_47# a_1126_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X21 VGND a_1738_47# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_409_329# a_27_47# a_506_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X23 VPWR a_27_47# a_211_363# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X24 a_702_21# a_506_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X25 a_409_329# a_211_363# a_506_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X26 a_866_47# a_506_47# a_702_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_1416_47# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_1738_47# a_1126_413# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VGND a_1126_413# a_1288_261# VNB sky130_fd_pr__nfet_01v8 w=540000u l=150000u
+X30 VGND a_506_47# a_1156_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 VPWR a_1738_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.cdl b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.cdl
index bf42a54..2122a7c 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.cdl
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_hdll__dfstp_2 CLK D SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI36 net120 M0 VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nshort m=1 w=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.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nshort m=1 w=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.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 net120 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 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.54 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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.36 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net128 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB 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
-MI37 net179 M0 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
-MI43 db clkpos 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
-MI45 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 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.18 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net156 M1 VPB phighvt m=1 w=0.42 l=0.18 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.18 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.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
+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.18 mult=1 sa=0.265 sb=0.265
+MI647 S1 S0 VNB nfet_01v8 m=1 w=0.54 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 S0 clkpos VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net128 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B 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
-MI648 S1 S0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB 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
-MI663 net128 S0 VPB phighvt m=1 w=1 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net128 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net179 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net156 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net143 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net128 S0 VPB pfet_01v8_hvt m=1 w=1 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net128 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dfstp_2
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.netlist.tsv b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.netlist.tsv
index cf4d9c7..753b4e7 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.netlist.tsv
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_hdll__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.36	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.64	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.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
-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.54	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net100	VNB	nshort	1	0.36	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net128	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net179	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net179	M0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net156	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net156	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net143	S1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net143	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net128	S0	VPWR	VPB	phighvt	1	1	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net128	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net120	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.36	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.64	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.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
+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.54	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net100	VNB	nfet_01v8	1	0.36	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net128	VGND	VNB	nfet_01v8	2	0.65	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.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net179	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net179	M0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net128	S0	VPWR	VPB	pfet_01v8_hvt	1	1	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net128	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.spice b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.spice
index 08c35f9..da68c75 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.spice
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_hdll__dfstp_2 CLK D SET_B VGND VNB VPB VPWR Q
-M1000 VPWR SET_B a_1126_413# VPB phighvt w=420000u l=180000u
-+  ad=1.6789e+12p pd=1.611e+07u as=2.856e+11p ps=3.04e+06u
-M1001 VPWR a_1738_47# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1002 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.33055e+12p ps=1.269e+07u
-M1003 a_506_47# a_27_47# a_409_329# VNB nshort w=360000u l=150000u
-+  ad=1.8e+11p pd=1.72e+06u as=1.87e+11p ps=1.93e+06u
-M1004 a_1344_47# a_27_47# a_1126_413# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.596e+11p ps=1.6e+06u
-M1005 VGND a_1126_413# a_1738_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1006 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1007 VPWR a_702_21# a_610_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.974e+11p ps=1.78e+06u
-M1008 Q a_1738_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_1288_261# a_1244_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=9.66e+10p ps=1.3e+06u
-M1010 a_1126_413# a_211_363# a_1156_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1011 a_1044_413# a_506_47# VPWR VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=0p ps=0u
-M1012 VPWR a_1126_413# a_1738_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1013 a_409_329# D VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_409_329# D VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.625e+11p pd=2.39e+06u as=0p ps=0u
-M1015 a_1156_47# a_506_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_636_47# a_211_363# a_506_47# VNB nshort w=360000u l=150000u
-+  ad=1.341e+11p pd=1.5e+06u as=0p ps=0u
-M1017 VPWR a_506_47# a_702_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1018 a_1288_261# a_1126_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1019 a_610_413# a_27_47# a_506_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1020 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1021 a_866_47# SET_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1022 VGND a_1738_47# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.405e+11p ps=2.04e+06u
-M1023 VGND a_702_21# a_636_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1288_261# a_1126_413# VGND VNB nshort w=540000u l=150000u
-+  ad=1.404e+11p pd=1.6e+06u as=0p ps=0u
-M1025 a_1244_413# a_211_363# a_1126_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_702_21# a_506_47# a_866_47# VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1027 a_702_21# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1029 a_506_47# a_211_363# a_409_329# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1416_47# a_1288_261# a_1344_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1031 a_1126_413# a_27_47# a_1044_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND SET_B a_1416_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Q a_1738_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1126_413# a_27_47# a_1344_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR SET_B a_702_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 VPWR a_506_47# a_1044_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 a_1244_413# a_1288_261# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 Q a_1738_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND a_1738_47# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VGND SET_B a_866_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_1344_47# a_1288_261# a_1416_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_1126_413# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X9 VPWR a_1738_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X11 a_636_47# a_702_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR D a_409_329# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X13 VPWR a_1126_413# a_1288_261# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X14 VGND D a_409_329# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 a_506_47# a_211_363# a_636_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X16 VGND a_27_47# a_211_363# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1156_47# a_211_363# a_1126_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_506_47# a_27_47# a_610_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X19 a_610_413# a_702_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X20 a_1126_413# a_211_363# a_1244_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X21 a_1738_47# a_1126_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 Q a_1738_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_1044_413# a_27_47# a_1126_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X25 a_409_329# a_27_47# a_506_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X26 VPWR a_27_47# a_211_363# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X27 a_702_21# a_506_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X28 a_409_329# a_211_363# a_506_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X29 a_866_47# a_506_47# a_702_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_1416_47# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_1738_47# a_1126_413# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X32 VGND a_1126_413# a_1288_261# VNB sky130_fd_pr__nfet_01v8 w=540000u l=150000u
+X33 VGND a_506_47# a_1156_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.cdl b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.cdl
index 431df8a..38cf25a 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.cdl
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_hdll__dfstp_4 CLK D SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI36 net120 M0 VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nshort m=1 w=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.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nshort m=1 w=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.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 net120 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 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.54 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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.36 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=5 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB 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
-MI37 net179 M0 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
-MI43 db clkpos 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
-MI45 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 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.18 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net156 M1 VPB phighvt m=1 w=0.42 l=0.18 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.18 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.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
+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.18 mult=1 sa=0.265 sb=0.265
+MI647 S1 S0 VNB nfet_01v8 m=1 w=0.54 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 S0 clkpos VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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=5 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B 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
-MI648 S1 S0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB 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
-MI663 net128 S0 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net128 VPB phighvt m=5 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net179 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net156 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net143 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net128 S0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net128 VPB pfet_01v8_hvt m=5 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dfstp_4
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.netlist.tsv b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.netlist.tsv
index 3fcaf55..4b3af3b 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.netlist.tsv
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_hdll__dfstp_4	CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI36	MOSFET	net120	M0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.36	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.64	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.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
-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.54	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net100	VNB	nshort	1	0.36	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	5	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net179	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net179	M0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net156	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net156	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net143	S1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net143	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net128	S0	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net128	VPWR	VPB	phighvt	5	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net120	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.36	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.64	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.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
+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.54	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net100	VNB	nfet_01v8	1	0.36	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	5	0.65	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.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net179	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net179	M0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net128	VPWR	VPB	pfet_01v8_hvt	5	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.spice b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.spice
index 5245009..fba9788 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.spice
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_hdll__dfstp_4 CLK D SET_B VGND VNB VPB VPWR Q
-M1000 VPWR SET_B a_1126_413# VPB phighvt w=420000u l=180000u
-+  ad=1.9683e+12p pd=1.875e+07u as=2.856e+11p ps=3.04e+06u
-M1001 Q a_1738_47# VGND VNB nshort w=650000u l=150000u
-+  ad=5.85e+11p pd=5.7e+06u as=1.5993e+12p ps=1.487e+07u
-M1002 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1003 a_506_47# a_27_47# a_409_329# VNB nshort w=360000u l=150000u
-+  ad=1.8e+11p pd=1.72e+06u as=1.87e+11p ps=1.93e+06u
-M1004 Q a_1738_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.5e+11p pd=7.7e+06u as=0p ps=0u
-M1005 a_1344_47# a_27_47# a_1126_413# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.596e+11p ps=1.6e+06u
-M1006 VGND a_1126_413# a_1738_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1007 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1008 VPWR a_1738_47# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_1126_413# a_1738_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1010 VPWR a_702_21# a_610_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.974e+11p ps=1.78e+06u
-M1011 VPWR a_1288_261# a_1244_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=9.66e+10p ps=1.3e+06u
-M1012 a_1126_413# a_211_363# a_1156_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1013 a_1044_413# a_506_47# VPWR VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=0p ps=0u
-M1014 Q a_1738_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_1738_47# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Q a_1738_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_409_329# D VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Q a_1738_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_409_329# D VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.625e+11p pd=2.39e+06u as=0p ps=0u
-M1020 a_1156_47# a_506_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_636_47# a_211_363# a_506_47# VNB nshort w=360000u l=150000u
-+  ad=1.341e+11p pd=1.5e+06u as=0p ps=0u
-M1022 VPWR a_506_47# a_702_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1023 a_1288_261# a_1126_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1024 a_610_413# a_27_47# a_506_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1025 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1026 a_866_47# SET_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1027 VGND a_702_21# a_636_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1288_261# a_1126_413# VGND VNB nshort w=540000u l=150000u
-+  ad=1.404e+11p pd=1.6e+06u as=0p ps=0u
-M1029 a_1244_413# a_211_363# a_1126_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_702_21# a_506_47# a_866_47# VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1031 a_702_21# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1033 a_506_47# a_211_363# a_409_329# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1416_47# a_1288_261# a_1344_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1035 a_1126_413# a_27_47# a_1044_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR a_1738_47# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND SET_B a_1416_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Q a_1738_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND a_1738_47# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1126_413# a_27_47# a_1344_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR SET_B a_702_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 VPWR a_506_47# a_1044_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 a_1244_413# a_1288_261# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 Q a_1738_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND SET_B a_866_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_1344_47# a_1288_261# a_1416_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_1738_47# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_1126_413# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X9 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X10 a_636_47# a_702_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND a_1738_47# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VPWR D a_409_329# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X13 VPWR a_1126_413# a_1288_261# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X14 Q a_1738_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VGND D a_409_329# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 a_1738_47# a_1126_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X17 a_506_47# a_211_363# a_636_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X18 VGND a_27_47# a_211_363# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_1156_47# a_211_363# a_1126_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR a_1738_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 a_506_47# a_27_47# a_610_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X22 a_610_413# a_702_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X23 a_1126_413# a_211_363# a_1244_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X24 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VGND a_1738_47# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 a_1044_413# a_27_47# a_1126_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X27 a_409_329# a_27_47# a_506_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X28 VPWR a_27_47# a_211_363# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X29 a_702_21# a_506_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X30 a_409_329# a_211_363# a_506_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X31 a_866_47# a_506_47# a_702_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_1416_47# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_1738_47# a_1126_413# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 VGND a_1126_413# a_1288_261# VNB sky130_fd_pr__nfet_01v8 w=540000u l=150000u
+X35 Q a_1738_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X36 VGND a_506_47# a_1156_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 Q a_1738_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X38 VPWR a_1738_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X39 VPWR a_1738_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_2.spice b/cells/diode/sky130_fd_sc_hdll__diode_2.spice
index ec4a046..1fd734f 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_2.spice
+++ b/cells/diode/sky130_fd_sc_hdll__diode_2.spice
@@ -16,5 +16,5 @@
 
 
 .subckt sky130_fd_sc_hdll__diode_2 DIODE VGND VNB VPB VPWR
-D0 VNB DIODE ndiode p=5.36e+06u a=4.347e+11p
+X0 VNB DIODE sky130_fd_pr__diode_pw2nd p=5.36e+06u a=4.347e+11p
 .ends
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_4.spice b/cells/diode/sky130_fd_sc_hdll__diode_4.spice
index ffde883..0dd2c5c 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_4.spice
+++ b/cells/diode/sky130_fd_sc_hdll__diode_4.spice
@@ -16,5 +16,5 @@
 
 
 .subckt sky130_fd_sc_hdll__diode_4 DIODE VGND VNB VPB VPWR
-D0 VNB DIODE ndiode p=9.88e+06u a=1.0557e+12p
+X0 VNB DIODE sky130_fd_pr__diode_pw2nd p=9.88e+06u a=1.0557e+12p
 .ends
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_6.spice b/cells/diode/sky130_fd_sc_hdll__diode_6.spice
index dda7cda..fd66a62 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_6.spice
+++ b/cells/diode/sky130_fd_sc_hdll__diode_6.spice
@@ -16,5 +16,5 @@
 
 
 .subckt sky130_fd_sc_hdll__diode_6 DIODE VGND VNB VPB VPWR
-D0 VNB DIODE ndiode p=1.47e+07u a=2.2032e+12p
+X0 VNB DIODE sky130_fd_pr__diode_pw2nd p=1.47e+07u a=2.2032e+12p
 .ends
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_8.spice b/cells/diode/sky130_fd_sc_hdll__diode_8.spice
index 226ef24..bd32ccc 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_8.spice
+++ b/cells/diode/sky130_fd_sc_hdll__diode_8.spice
@@ -16,5 +16,5 @@
 
 
 .subckt sky130_fd_sc_hdll__diode_8 DIODE VGND VNB VPB VPWR
-D0 VNB DIODE ndiode p=1.858e+07u a=3.5464e+12p
+X0 VNB DIODE sky130_fd_pr__diode_pw2nd p=1.858e+07u a=3.5464e+12p
 .ends
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.cdl b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.cdl
index 7b94974..e9313c0 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.cdl
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlrtn_1 D GATE_N RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 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
-MI633 clkpos GATE_N VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B 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
-MI18 net54 db VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net50 m1 VPB 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
-MI651 M0 clkpos 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
-MI655 m1 M0 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
-MI638 db D VPB phighvt m=1 w=0.64 l=0.18 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 net54 db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net93 RESET_B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI653 net50 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net101 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB 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.18 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.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ 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.65 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.36 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net93 RESET_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net101 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net81 db VNB nshort m=1 w=0.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.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net81 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlrtn_1
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.netlist.tsv b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.netlist.tsv
index 1424ad6..b0c1f9f 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.netlist.tsv
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net54	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net54	db	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net50	m1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net50	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net93	RESET_B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net101	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net93	VNB	nshort	1	0.65	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	net81	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net81	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net54	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net54	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net50	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net50	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net93	RESET_B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net101	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net93	VNB	nfet_01v8	1	0.65	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	net81	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net81	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_hdll__dlrtn_1.spice b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.spice
index 07b99ed..24548a2 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.spice
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__dlrtn_1 D GATE_N RESET_B VGND VNB VPB VPWR Q
-M1000 VGND a_750_21# a_708_47# VNB nshort w=420000u l=150000u
-+  ad=5.6425e+11p pd=6.14e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR GATE_N a_27_363# VPB phighvt w=640000u l=180000u
-+  ad=1.131e+12p pd=9.75e+06u as=1.728e+11p ps=1.82e+06u
-M1002 a_203_47# a_27_363# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1003 VPWR a_750_21# a_702_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1004 a_503_369# a_319_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=0p ps=0u
-M1005 a_708_47# a_203_47# a_604_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1006 Q a_750_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1007 VGND D a_319_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1008 VPWR D a_319_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1009 VGND RESET_B a_981_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.6575e+11p ps=1.81e+06u
-M1010 a_604_47# a_27_363# a_500_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1011 Q a_750_21# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1012 VPWR RESET_B a_750_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1013 a_981_47# a_604_47# a_750_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1014 VGND GATE_N a_27_363# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1015 a_702_413# a_27_363# a_604_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1016 a_203_47# a_27_363# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1017 a_604_47# a_203_47# a_503_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_500_47# a_319_369# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_750_21# a_604_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_702_413# a_750_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VGND a_750_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_27_363# GATE_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X3 VPWR a_604_47# a_750_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_981_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_319_369# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_503_369# a_203_47# a_604_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 a_604_47# a_203_47# a_708_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_750_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND a_319_369# a_500_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_750_21# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VGND a_27_363# a_203_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR a_319_369# a_503_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X13 a_27_363# GATE_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VPWR a_27_363# a_203_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X15 a_708_47# a_750_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_750_21# a_604_47# a_981_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_500_47# a_27_363# a_604_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X18 a_319_369# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X19 a_604_47# a_27_363# a_702_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.cdl b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.cdl
index f0a7d9a..9e6001d 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.cdl
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlrtn_2 D GATE_N RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B 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
-MI18 net54 db VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net50 m1 VPB 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
-MI651 M0 clkpos 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
-MI655 m1 M0 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
-MI638 db D VPB phighvt m=1 w=0.64 l=0.18 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 net54 db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net93 RESET_B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI653 net50 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net101 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB 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.18 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.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ 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.65 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.36 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net93 RESET_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net101 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net81 db VNB nshort m=1 w=0.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.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net81 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlrtn_2
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.netlist.tsv b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.netlist.tsv
index 309a149..4ffc1dc 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.netlist.tsv
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net54	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net54	db	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net50	m1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net50	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net93	RESET_B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net101	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net93	VNB	nshort	1	0.65	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	net81	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net81	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net54	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net54	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net50	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net50	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net93	RESET_B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net101	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net93	VNB	nfet_01v8	1	0.65	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	net81	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net81	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_hdll__dlrtn_2.spice b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.spice
index 252035a..ed7665d 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.spice
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_hdll__dlrtn_2 D GATE_N RESET_B VGND VNB VPB VPWR Q
-M1000 VGND a_750_21# a_708_47# VNB nshort w=420000u l=150000u
-+  ad=8.0475e+11p pd=8.18e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR GATE_N a_27_363# VPB phighvt w=640000u l=180000u
-+  ad=1.411e+12p pd=1.231e+07u as=1.728e+11p ps=1.82e+06u
-M1002 VPWR a_750_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1003 a_203_47# a_27_363# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1004 VPWR a_750_21# a_702_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1005 VGND a_750_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1006 a_503_369# a_319_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=0p ps=0u
-M1007 a_708_47# a_203_47# a_604_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1008 Q a_750_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Q a_750_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND D a_319_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1011 VPWR D a_319_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1012 VGND RESET_B a_981_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.6575e+11p ps=1.81e+06u
-M1013 a_604_47# a_27_363# a_500_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1014 VPWR RESET_B a_750_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1015 a_981_47# a_604_47# a_750_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1016 VGND GATE_N a_27_363# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1017 a_702_413# a_27_363# a_604_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1018 a_203_47# a_27_363# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1019 a_604_47# a_203_47# a_503_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_500_47# a_319_369# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_750_21# a_604_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_702_413# a_750_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 Q a_750_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_27_363# GATE_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X3 VPWR a_604_47# a_750_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_981_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_319_369# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_503_369# a_203_47# a_604_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 a_604_47# a_203_47# a_708_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_750_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND a_319_369# a_500_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 Q a_750_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_750_21# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VGND a_27_363# a_203_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VPWR a_319_369# a_503_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X14 a_27_363# GATE_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VPWR a_27_363# a_203_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X16 a_708_47# a_750_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_750_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 a_750_21# a_604_47# a_981_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_500_47# a_27_363# a_604_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X20 a_319_369# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X21 a_604_47# a_27_363# a_702_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.cdl b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.cdl
index ac2c6f8..0e75fe2 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.cdl
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlrtn_4 D GATE_N RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B 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
-MI18 net54 db VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net50 m1 VPB 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
-MI651 M0 clkpos 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
-MI655 m1 M0 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
-MI638 db D VPB phighvt m=1 w=0.64 l=0.18 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 net54 db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net93 RESET_B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI653 net50 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net101 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB 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.18 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.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ 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.65 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.36 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net93 RESET_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net101 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net81 db VNB nshort m=1 w=0.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.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net81 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlrtn_4
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.netlist.tsv b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.netlist.tsv
index a4120d6..2a81d8c 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.netlist.tsv
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net54	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net54	db	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net50	m1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net50	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net93	RESET_B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net101	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net93	VNB	nshort	1	0.65	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	net81	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net81	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net54	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net54	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net50	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net50	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net93	RESET_B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net101	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net93	VNB	nfet_01v8	1	0.65	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	net81	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net81	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_hdll__dlrtn_4.spice b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.spice
index df99761..e9af228 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.spice
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_hdll__dlrtn_4 D GATE_N RESET_B VGND VNB VPB VPWR Q
-M1000 Q a_750_21# VGND VNB nshort w=650000u l=150000u
-+  ad=3.51e+11p pd=3.68e+06u as=1.00625e+12p ps=1.01e+07u
-M1001 VGND a_750_21# a_708_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1002 Q a_750_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.691e+12p ps=1.487e+07u
-M1003 VPWR GATE_N a_27_363# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1004 VPWR a_750_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_203_47# a_27_363# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1006 VPWR a_750_21# a_702_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1007 VGND a_750_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_503_369# a_319_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=0p ps=0u
-M1009 a_708_47# a_203_47# a_604_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1010 Q a_750_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Q a_750_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND D a_319_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1013 VPWR D a_319_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1014 VGND RESET_B a_981_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.6575e+11p ps=1.81e+06u
-M1015 a_604_47# a_27_363# a_500_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1016 VPWR RESET_B a_750_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1017 a_981_47# a_604_47# a_750_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1018 VGND GATE_N a_27_363# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1019 a_702_413# a_27_363# a_604_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1020 a_203_47# a_27_363# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1021 a_604_47# a_203_47# a_503_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_750_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_500_47# a_319_369# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_750_21# a_604_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_750_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_702_413# a_750_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 Q a_750_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_27_363# GATE_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X3 VPWR a_604_47# a_750_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_981_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_319_369# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_503_369# a_203_47# a_604_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 a_604_47# a_203_47# a_708_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_750_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND a_319_369# a_500_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 Q a_750_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_750_21# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VGND a_27_363# a_203_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VPWR a_319_369# a_503_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X14 a_27_363# GATE_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 Q a_750_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VPWR a_27_363# a_203_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X17 Q a_750_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VPWR a_750_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_708_47# a_750_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VGND a_750_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 a_750_21# a_604_47# a_981_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_500_47# a_27_363# a_604_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X23 a_319_369# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X24 a_604_47# a_27_363# a_702_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X25 VGND a_750_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.cdl b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.cdl
index c074059..2af7aa1 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.cdl
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlrtp_1 D GATE RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 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
-MI633 clkneg GATE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI633 clkneg GATE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB 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
-MI18 net54 db VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net50 m1 VPB 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
-MI651 M0 clkpos 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
-MI655 m1 M0 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
-MI638 db D VPB phighvt m=1 w=0.64 l=0.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net93 RESET_B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI18 net54 db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net101 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 net50 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 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.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ 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.65 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.36 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net93 RESET_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net101 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net81 db VNB nshort m=1 w=0.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.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net81 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlrtp_1
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.netlist.tsv b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.netlist.tsv
index 598766d..42abb07 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.netlist.tsv
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net54	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net54	db	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net50	m1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net50	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net93	RESET_B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net101	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net93	VNB	nshort	1	0.65	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	net81	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net81	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net54	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net54	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net50	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net50	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net93	RESET_B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net101	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net93	VNB	nfet_01v8	1	0.65	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	net81	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net81	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_hdll__dlrtp_1.spice b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.spice
index ef7782c..f897d0d 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.spice
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__dlrtp_1 D GATE RESET_B VGND VNB VPB VPWR Q
-M1000 VGND a_750_21# a_708_47# VNB nshort w=420000u l=150000u
-+  ad=5.6425e+11p pd=6.14e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR GATE a_27_363# VPB phighvt w=640000u l=180000u
-+  ad=1.131e+12p pd=9.75e+06u as=1.728e+11p ps=1.82e+06u
-M1002 a_203_47# a_27_363# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1003 VPWR a_750_21# a_702_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1004 a_503_369# a_319_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=0p ps=0u
-M1005 a_708_47# a_27_363# a_604_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1006 Q a_750_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1007 VGND D a_319_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1008 VPWR D a_319_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1009 VGND RESET_B a_981_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.6575e+11p ps=1.81e+06u
-M1010 a_604_47# a_203_47# a_500_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1011 Q a_750_21# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1012 VPWR RESET_B a_750_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1013 a_981_47# a_604_47# a_750_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1014 VGND GATE a_27_363# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1015 a_702_413# a_203_47# a_604_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1016 a_203_47# a_27_363# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1017 a_604_47# a_27_363# a_503_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_500_47# a_319_369# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_750_21# a_604_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_702_413# a_750_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VGND a_750_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_27_363# GATE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X3 VPWR a_604_47# a_750_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_981_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_319_369# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_503_369# a_27_363# a_604_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 a_604_47# a_27_363# a_708_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_750_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND a_319_369# a_500_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_750_21# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VGND a_27_363# a_203_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR a_319_369# a_503_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X13 a_27_363# GATE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VPWR a_27_363# a_203_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X15 a_708_47# a_750_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_750_21# a_604_47# a_981_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_500_47# a_203_47# a_604_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X18 a_319_369# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X19 a_604_47# a_203_47# a_702_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.cdl b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.cdl
index a56ee8e..b2ef195 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.cdl
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlrtp_2 D GATE RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkneg GATE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI633 clkneg GATE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB 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
-MI18 net54 db VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net50 m1 VPB 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
-MI651 M0 clkpos 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
-MI655 m1 M0 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
-MI638 db D VPB phighvt m=1 w=0.64 l=0.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net93 RESET_B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI18 net54 db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net101 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 net50 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 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.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ 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.65 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.36 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net93 RESET_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net101 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net81 db VNB nshort m=1 w=0.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.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net81 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlrtp_2
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.netlist.tsv b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.netlist.tsv
index e317d11..8118bcb 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.netlist.tsv
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net54	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net54	db	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net50	m1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net50	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net93	RESET_B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net101	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net93	VNB	nshort	1	0.65	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	net81	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net81	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net54	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net54	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net50	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net50	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net93	RESET_B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net101	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net93	VNB	nfet_01v8	1	0.65	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	net81	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net81	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_hdll__dlrtp_2.spice b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.spice
index ce56ef2..1c0aeff 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.spice
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_hdll__dlrtp_2 D GATE RESET_B VGND VNB VPB VPWR Q
-M1000 VGND a_750_21# a_708_47# VNB nshort w=420000u l=150000u
-+  ad=8.0475e+11p pd=8.18e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR GATE a_27_363# VPB phighvt w=640000u l=180000u
-+  ad=1.411e+12p pd=1.231e+07u as=1.728e+11p ps=1.82e+06u
-M1002 VPWR a_750_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1003 a_203_47# a_27_363# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1004 VPWR a_750_21# a_702_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1005 VGND a_750_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1006 a_503_369# a_319_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=0p ps=0u
-M1007 a_708_47# a_27_363# a_604_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1008 Q a_750_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Q a_750_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND D a_319_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1011 VPWR D a_319_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1012 VGND RESET_B a_981_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.6575e+11p ps=1.81e+06u
-M1013 a_604_47# a_203_47# a_500_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1014 VPWR RESET_B a_750_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1015 a_981_47# a_604_47# a_750_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1016 VGND GATE a_27_363# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1017 a_702_413# a_203_47# a_604_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1018 a_203_47# a_27_363# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1019 a_604_47# a_27_363# a_503_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_500_47# a_319_369# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_750_21# a_604_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_702_413# a_750_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 Q a_750_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_27_363# GATE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X3 VPWR a_604_47# a_750_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_981_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_319_369# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_503_369# a_27_363# a_604_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 a_604_47# a_27_363# a_708_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_750_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND a_319_369# a_500_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 Q a_750_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_750_21# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VGND a_27_363# a_203_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VPWR a_319_369# a_503_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X14 a_27_363# GATE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VPWR a_27_363# a_203_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X16 a_708_47# a_750_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_750_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 a_750_21# a_604_47# a_981_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_500_47# a_203_47# a_604_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X20 a_319_369# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X21 a_604_47# a_203_47# a_702_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.cdl b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.cdl
index a4ba641..47f735d 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.cdl
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlrtp_4 D GATE RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkneg GATE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI633 clkneg GATE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB 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
-MI18 net54 db VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net50 m1 VPB 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
-MI651 M0 clkpos 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
-MI655 m1 M0 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
-MI638 db D VPB phighvt m=1 w=0.64 l=0.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net93 RESET_B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI18 net54 db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net101 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 net50 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 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.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ 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.65 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.36 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net93 RESET_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net101 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net81 db VNB nshort m=1 w=0.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.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net81 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlrtp_4
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.netlist.tsv b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.netlist.tsv
index 1aaaa4e..fc8bfb0 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.netlist.tsv
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net54	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net54	db	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net50	m1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net50	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net93	RESET_B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net101	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net93	VNB	nshort	1	0.65	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	net81	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net81	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net54	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net54	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net50	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net50	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net93	RESET_B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net101	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net93	VNB	nfet_01v8	1	0.65	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	net81	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net81	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_hdll__dlrtp_4.spice b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.spice
index 9842579..f9e328c 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.spice
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_hdll__dlrtp_4 D GATE RESET_B VGND VNB VPB VPWR Q
-M1000 Q a_750_21# VGND VNB nshort w=650000u l=150000u
-+  ad=3.51e+11p pd=3.68e+06u as=1.00625e+12p ps=1.01e+07u
-M1001 VGND a_750_21# a_708_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1002 Q a_750_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.691e+12p ps=1.487e+07u
-M1003 VPWR GATE a_27_363# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1004 VPWR a_750_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_203_47# a_27_363# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1006 VPWR a_750_21# a_702_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1007 VGND a_750_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_503_369# a_319_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=0p ps=0u
-M1009 a_708_47# a_27_363# a_604_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1010 Q a_750_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Q a_750_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND D a_319_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1013 VPWR D a_319_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1014 VGND RESET_B a_981_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.6575e+11p ps=1.81e+06u
-M1015 a_604_47# a_203_47# a_500_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1016 VPWR RESET_B a_750_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1017 a_981_47# a_604_47# a_750_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1018 VGND GATE a_27_363# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1019 a_702_413# a_203_47# a_604_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1020 a_203_47# a_27_363# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1021 a_604_47# a_27_363# a_503_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_750_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_500_47# a_319_369# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_750_21# a_604_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_750_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_702_413# a_750_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 Q a_750_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_27_363# GATE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X3 VPWR a_604_47# a_750_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_981_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_319_369# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_503_369# a_27_363# a_604_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 a_604_47# a_27_363# a_708_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_750_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND a_319_369# a_500_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 Q a_750_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_750_21# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VGND a_27_363# a_203_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VPWR a_319_369# a_503_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X14 a_27_363# GATE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 Q a_750_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VPWR a_27_363# a_203_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X17 Q a_750_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VPWR a_750_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_708_47# a_750_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VGND a_750_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 a_750_21# a_604_47# a_981_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_500_47# a_203_47# a_604_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X23 a_319_369# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X24 a_604_47# a_203_47# a_702_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X25 VGND a_750_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.cdl b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.cdl
index 8fad299..2e44ad4 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.cdl
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlxtn_1 D GATE_N VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 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
-MI633 clkpos GATE_N VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net53 db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net53 db VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net44 m1 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
-MI651 M0 clkpos 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
-MI655 m1 M0 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
-MI638 db D VPB phighvt m=1 w=0.64 l=0.18 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
+MI653 net44 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net96 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB 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.18 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.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ 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.65 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.36 l=0.15 mult=1 sa=0.265 sb=0.265
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net96 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net76 db VNB nshort m=1 w=0.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.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net76 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlxtn_1
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.netlist.tsv b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.netlist.tsv
index 46508d4..ee0d494 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.netlist.tsv
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.netlist.tsv
@@ -1,20 +1,20 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net53	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net53	db	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net44	m1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net44	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net96	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net96	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	VGND	VNB	nshort	1	0.65	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	net76	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net76	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net53	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net53	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net44	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net44	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net96	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net96	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.65	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	net76	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net76	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_hdll__dlxtn_1.spice b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.spice
index 11c1c1b..500c10c 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.spice
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_hdll__dlxtn_1 D GATE_N VGND VNB VPB VPWR Q
-M1000 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=6.009e+11p ps=6.32e+06u
-M1001 VPWR GATE_N a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=7.846e+11p pd=7.7e+06u as=1.728e+11p ps=1.82e+06u
-M1002 VPWR a_607_47# a_760_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1003 Q a_760_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=0p ps=0u
-M1004 a_716_413# a_27_47# a_607_47# VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=1.512e+11p ps=1.56e+06u
-M1005 VPWR a_760_21# a_716_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_607_47# a_760_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1007 a_503_369# a_319_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=0p ps=0u
-M1008 VGND D a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1009 a_499_47# a_319_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.554e+11p pd=1.62e+06u as=0p ps=0u
-M1010 a_695_47# a_211_363# a_607_47# VNB nshort w=360000u l=150000u
-+  ad=1.32e+11p pd=1.49e+06u as=1.044e+11p ps=1.3e+06u
-M1011 VPWR D a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1012 VGND GATE_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1013 Q a_760_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.4e+11p pd=2.68e+06u as=0p ps=0u
-M1014 a_607_47# a_27_47# a_499_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1016 VGND a_760_21# a_695_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_607_47# a_211_363# a_503_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_716_413# a_760_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VPWR a_760_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_499_47# a_27_47# a_607_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X3 VGND a_760_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_27_47# GATE_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X5 a_607_47# a_27_47# a_716_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 a_319_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_503_369# a_211_363# a_607_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X8 VGND a_27_47# a_211_363# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_607_47# a_211_363# a_695_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X10 VPWR a_319_47# a_503_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X11 a_27_47# GATE_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_760_21# a_607_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_695_47# a_760_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_760_21# a_607_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VPWR a_27_47# a_211_363# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X16 a_319_47# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X17 VGND a_319_47# a_499_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.cdl b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.cdl
index 10ddce1..0756c5b 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.cdl
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlxtn_2 D GATE_N VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net51 db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net51 db VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net47 m1 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
-MI651 M0 clkpos 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
-MI655 m1 M0 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
-MI638 db D VPB phighvt m=1 w=0.64 l=0.18 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
+MI653 net47 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net94 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB 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.18 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.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ 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.65 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.36 l=0.15 mult=1 sa=0.265 sb=0.265
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net94 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net74 db VNB nshort m=1 w=0.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.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net74 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlxtn_2
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.netlist.tsv b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.netlist.tsv
index b887829..3012e76 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.netlist.tsv
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.netlist.tsv
@@ -1,20 +1,20 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net47	m1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net47	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net94	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net94	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	VGND	VNB	nshort	1	0.65	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	net74	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net74	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net47	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net47	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net94	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net94	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.65	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	net74	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net74	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_hdll__dlxtn_2.spice b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.spice
index 7df0162..d0e64a1 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.spice
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__dlxtn_2 D GATE_N VGND VNB VPB VPWR Q
-M1000 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=7.76e+11p ps=8.18e+06u
-M1001 a_718_47# a_211_363# a_608_413# VNB nshort w=360000u l=150000u
-+  ad=1.32e+11p pd=1.49e+06u as=1.35e+11p ps=1.47e+06u
-M1002 VPWR GATE_N a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=1.0446e+12p pd=1.022e+07u as=1.728e+11p ps=1.82e+06u
-M1003 a_503_369# a_319_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=0p ps=0u
-M1004 VPWR a_783_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1005 a_739_413# a_27_47# a_608_413# VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=1.995e+11p ps=1.79e+06u
-M1006 a_505_47# a_319_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.554e+11p pd=1.62e+06u as=0p ps=0u
-M1007 VGND a_783_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1008 Q a_783_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND D a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1010 VPWR D a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1011 VGND a_783_21# a_718_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Q a_783_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_608_413# a_27_47# a_505_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_608_413# a_783_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1015 VGND GATE_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1016 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1017 VPWR a_608_413# a_783_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1018 a_608_413# a_211_363# a_503_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_783_21# a_739_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_505_47# a_27_47# a_608_413# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X1 Q a_783_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_783_21# a_608_413# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_27_47# GATE_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X4 a_608_413# a_211_363# a_718_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X5 a_783_21# a_608_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_319_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_503_369# a_211_363# a_608_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X8 VGND a_27_47# a_211_363# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_718_47# a_783_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND a_783_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_608_413# a_27_47# a_739_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X12 Q a_783_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VPWR a_319_47# a_503_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X14 a_27_47# GATE_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VPWR a_783_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VPWR a_27_47# a_211_363# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X17 a_739_413# a_783_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X18 a_319_47# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X19 VGND a_319_47# a_505_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.cdl b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.cdl
index b420115..52ea1bc 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.cdl
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlxtn_4 D GATE_N VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net51 db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net51 db VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net47 m1 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
-MI651 M0 clkpos 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
-MI655 m1 M0 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
-MI638 db D VPB phighvt m=1 w=0.64 l=0.18 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
+MI653 net47 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net94 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB 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.18 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.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ 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.65 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.36 l=0.15 mult=1 sa=0.265 sb=0.265
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net94 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net74 db VNB nshort m=1 w=0.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.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net74 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlxtn_4
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.netlist.tsv b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.netlist.tsv
index a2114d8..6ffcff7 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.netlist.tsv
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.netlist.tsv
@@ -1,20 +1,20 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net47	m1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net47	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net94	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net94	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	VGND	VNB	nshort	1	0.65	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	net74	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net74	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net47	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net47	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net94	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net94	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.65	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	net74	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net74	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_hdll__dlxtn_4.spice b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.spice
index 1196c4f..d37353e 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.spice
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__dlxtn_4 D GATE_N VGND VNB VPB VPWR Q
-M1000 a_709_47# a_211_363# a_609_413# VNB nshort w=360000u l=150000u
-+  ad=1.32e+11p pd=1.49e+06u as=1.008e+11p ps=1.28e+06u
-M1001 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=9.9375e+11p ps=1.015e+07u
-M1002 Q a_774_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.3496e+12p ps=1.283e+07u
-M1003 Q a_774_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=0p ps=0u
-M1004 VPWR GATE_N a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1005 VGND a_774_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_503_369# a_319_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.042e+11p pd=1.98e+06u as=0p ps=0u
-M1007 a_505_47# a_319_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.734e+11p pd=1.72e+06u as=0p ps=0u
-M1008 a_609_413# a_27_47# a_505_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_774_21# a_709_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND D a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1011 VPWR D a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1012 Q a_774_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_774_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_609_413# a_774_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1015 a_703_413# a_27_47# a_609_413# VPB phighvt w=420000u l=180000u
-+  ad=1.533e+11p pd=1.57e+06u as=1.218e+11p ps=1.42e+06u
-M1016 VGND GATE_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1017 VPWR a_609_413# a_774_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1018 a_609_413# a_211_363# a_503_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1020 Q a_774_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_774_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_774_21# a_703_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_774_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_609_413# a_27_47# a_703_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 a_774_21# a_609_413# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_609_413# a_211_363# a_709_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X3 a_27_47# GATE_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X4 a_709_47# a_774_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_319_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_774_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_503_369# a_211_363# a_609_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X8 VGND a_27_47# a_211_363# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND a_774_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VGND a_774_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_774_21# a_609_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 Q a_774_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VPWR a_319_47# a_503_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X14 a_27_47# GATE_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VPWR a_774_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VPWR a_27_47# a_211_363# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X17 Q a_774_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 a_505_47# a_27_47# a_609_413# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X19 a_319_47# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X20 a_703_413# a_774_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X21 VGND a_319_47# a_505_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 Q a_774_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 Q a_774_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.cdl b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.cdl
index 758f364..a7b92f9 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.cdl
+++ b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlygate4sd1_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab net34 VNB 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=1 w=0.65 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
+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.0 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net34 net30 VPB 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.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net34 net30 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net30 A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlygate4sd1_1
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.netlist.tsv b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.netlist.tsv
index 78e9464..507f7a0 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.netlist.tsv
+++ b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__dlygate4sd1_1	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Ab	net34	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	1	0.65	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	1	1.0	0.18	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.18	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.65	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.spice b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.spice
index c3f834f..ea6b68f 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.spice
+++ b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__dlygate4sd1_1 A VGND VNB VPB VPWR X
-M1000 a_213_47# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=5.039e+11p ps=3.97e+06u
-M1001 X a_319_93# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1002 VPWR a_213_47# a_319_93# VPB phighvt w=420000u l=180000u
-+  ad=6.233e+11p pd=4.51e+06u as=1.176e+11p ps=1.4e+06u
-M1003 X a_319_93# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1004 a_213_47# a_27_47# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1005 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1006 VGND a_213_47# a_319_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1007 VPWR A a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
+X0 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VGND a_319_93# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_319_93# a_213_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 VGND a_27_47# a_213_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_319_93# a_213_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_27_47# a_213_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 VPWR a_319_93# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.cdl b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.cdl
index c0b6c72..74a48da 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.cdl
+++ b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlygate4sd2_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab net34 VNB 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=1 w=0.65 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
+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.0 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net34 net30 VPB 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.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net34 net30 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net30 A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlygate4sd2_1
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.netlist.tsv b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.netlist.tsv
index d737cff..0665d85 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.netlist.tsv
+++ b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__dlygate4sd2_1	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Ab	net34	VGND	VNB	nshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	1	0.65	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.0	0.18	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.18	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.65	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.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.spice b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.spice
index e650b0b..27b593f 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.spice
+++ b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__dlygate4sd2_1 A VGND VNB VPB VPWR X
-M1000 a_213_47# a_27_47# VGND VNB nshort w=420000u l=180000u
-+  ad=1.092e+11p pd=1.36e+06u as=4.913e+11p ps=3.91e+06u
-M1001 X a_319_93# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1002 VPWR a_213_47# a_319_93# VPB phighvt w=420000u l=180000u
-+  ad=6.233e+11p pd=4.51e+06u as=1.176e+11p ps=1.4e+06u
-M1003 X a_319_93# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1004 a_213_47# a_27_47# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1005 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1006 VGND a_213_47# a_319_93# VNB nshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1007 VPWR A a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
+X0 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VGND a_319_93# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_319_93# a_213_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 VGND a_27_47# a_213_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=180000u
+X4 a_319_93# a_213_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=180000u
+X5 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_27_47# a_213_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 VPWR a_319_93# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.cdl b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.cdl
index 27ff2ce..24722bb 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.cdl
+++ b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlygate4sd3_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab net34 VNB nshort m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab net34 VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net34 net30 VNB nshort m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI6 net34 net30 VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net30 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net30 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Ab net34 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab net34 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net34 net30 VPB 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 net30 A 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
+MI7 net34 net30 VPB pfet_01v8_hvt m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net30 A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlygate4sd3_1
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.netlist.tsv b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.netlist.tsv
index 4f58c9a..69c2dd6 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.netlist.tsv
+++ b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__dlygate4sd3_1	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Ab	net34	VGND	VNB	nshort	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net34	net30	VGND	VNB	nshort	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net30	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	net34	VPWR	VPB	phighvt	1	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net34	net30	VPWR	VPB	phighvt	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net30	A	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	net34	VGND	VNB	nfet_01v8	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net34	net30	VGND	VNB	nfet_01v8	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net30	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	net34	VPWR	VPB	pfet_01v8_hvt	1	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.0	0.18	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.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net30	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.spice b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.spice
index 790c485..036a007 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.spice
+++ b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__dlygate4sd3_1 A VGND VNB VPB VPWR X
-M1000 VPWR a_273_47# a_379_93# VPB phighvt w=420000u l=500000u
-+  ad=4.491e+11p pd=4.15e+06u as=1.092e+11p ps=1.36e+06u
-M1001 X a_379_93# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1002 VPWR A a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1003 a_273_47# a_27_47# VGND VNB nshort w=420000u l=500000u
-+  ad=1.092e+11p pd=1.36e+06u as=3.636e+11p ps=3.51e+06u
-M1004 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1005 X a_379_93# VGND VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=0p ps=0u
-M1006 VGND a_273_47# a_379_93# VNB nshort w=420000u l=500000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1007 a_273_47# a_27_47# VPWR VPB phighvt w=420000u l=500000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
+X0 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 a_379_93# a_273_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=500000u
+X2 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND a_379_93# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR a_27_47# a_273_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=500000u
+X5 VPWR a_379_93# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND a_27_47# a_273_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=500000u
+X7 a_379_93# a_273_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=500000u
 .ends
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.cdl b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.cdl
index 2b3b5b9..7454941 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.cdl
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__ebufn_1 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z net35 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z net35 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA net39 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net39 TE_B VNB nshort m=1 w=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 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net35 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMN1 sndA net39 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 net39 TE_B VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMIN1 net39 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 net35 A VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI6 net35 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net35 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net39 TE_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net35 A VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__ebufn_1
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.netlist.tsv b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.netlist.tsv
index 1cfb901..de45693 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.netlist.tsv
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__ebufn_1	A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMN0	MOSFET	Z	net35	sndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net39	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net39	TE_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	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	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net35	Z	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net39	TE_B	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net35	A	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net35	sndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net39	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net39	TE_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	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	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net35	Z	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net39	TE_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net35	A	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.spice b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.spice
index 5b31b14..2587b65 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.spice
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__ebufn_1 A TE_B VGND VNB VPB VPWR Z
-M1000 Z a_27_47# a_543_47# VNB nshort w=650000u l=150000u
-+  ad=3.055e+11p pd=2.24e+06u as=1.365e+11p ps=1.72e+06u
-M1001 VPWR A a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=4.656e+11p pd=4.42e+06u as=1.728e+11p ps=1.82e+06u
-M1002 a_543_47# a_211_369# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.6525e+11p ps=3.83e+06u
-M1003 a_411_297# TE_B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.8e+11p pd=3.76e+06u as=0p ps=0u
-M1004 Z a_27_47# a_411_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.95e+11p pd=2.79e+06u as=0p ps=0u
-M1005 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1006 a_211_369# TE_B VGND VNB nshort w=420000u l=150000u
-+  ad=2.814e+11p pd=2.18e+06u as=0p ps=0u
-M1007 a_211_369# TE_B VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
+X0 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X1 VPWR TE_B a_411_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VGND a_211_369# a_543_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_543_47# a_27_47# Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_411_297# a_27_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VPWR TE_B a_211_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X6 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND TE_B a_211_369# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.cdl b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.cdl
index b79af68..642fa35 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.cdl
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__ebufn_2 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z net35 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z net35 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA net39 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net39 TE_B VNB nshort m=1 w=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 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=2 w=0.94 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net35 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMN1 sndA net39 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 net39 TE_B VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMIN1 net39 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 net35 A VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI6 net35 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB pfet_01v8_hvt m=2 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net35 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net39 TE_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net35 A VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__ebufn_2
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.netlist.tsv b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.netlist.tsv
index 240d858..d4a9f2a 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.netlist.tsv
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__ebufn_2	A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMN0	MOSFET	Z	net35	sndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net39	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net39	TE_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	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	2	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net35	Z	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net39	TE_B	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net35	A	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net35	sndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net39	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net39	TE_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	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	2	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net35	Z	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net39	TE_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net35	A	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.spice b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.spice
index dd49f1f..d84f2be 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.spice
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__ebufn_2 A TE_B VGND VNB VPB VPWR Z
-M1000 VPWR A a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=5.254e+11p pd=4.53e+06u as=1.728e+11p ps=1.82e+06u
-M1001 VGND a_224_47# a_412_47# VNB nshort w=650000u l=150000u
-+  ad=3.54e+11p pd=3.53e+06u as=6.8575e+11p ps=6.01e+06u
-M1002 a_224_47# TE_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1003 a_340_309# a_27_47# Z VPB phighvt w=1e+06u l=180000u
-+  ad=1.3537e+12p pd=8.63e+06u as=2.9e+11p ps=2.58e+06u
-M1004 a_412_47# a_224_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_412_47# a_27_47# Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.405e+11p ps=2.04e+06u
-M1006 a_224_47# TE_B VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1007 a_340_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR TE_B a_340_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Z a_27_47# a_340_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1011 Z a_27_47# a_412_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X1 a_412_47# a_224_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_412_47# a_27_47# Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR TE_B a_340_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X4 VPWR TE_B a_224_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X5 a_340_309# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X6 Z a_27_47# a_412_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Z a_27_47# a_340_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_340_309# a_27_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND TE_B a_224_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND a_224_47# a_412_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.cdl b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.cdl
index 4e97594..6c89241 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.cdl
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__ebufn_4 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z net35 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z net35 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA net39 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net39 TE_B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net35 A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB phighvt m=4 w=0.94 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net35 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMN1 sndA net39 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 net39 TE_B VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN1 net39 TE_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net35 A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net35 A 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
+MMP0 VPWR TE_B VPB pfet_01v8_hvt m=4 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net35 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net39 TE_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net35 A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__ebufn_4
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.netlist.tsv b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.netlist.tsv
index 750d830..9187d7d 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.netlist.tsv
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__ebufn_4	A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMN0	MOSFET	Z	net35	sndA	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net39	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net39	TE_B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net35	A	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	phighvt	4	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net35	Z	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net39	TE_B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net35	A	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net35	sndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net39	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net39	TE_B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net35	A	VGND	VNB	nfet_01v8	1	0.65	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	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net35	Z	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net39	TE_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net35	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.spice b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.spice
index 5d8ec0a..3b278a3 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.spice
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__ebufn_4 A TE_B VGND VNB VPB VPWR Z
-M1000 a_340_309# a_27_47# Z VPB phighvt w=1e+06u l=180000u
-+  ad=1.9263e+12p pd=1.369e+07u as=5.8e+11p ps=5.16e+06u
-M1001 Z a_27_47# a_413_47# VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=1.053e+12p ps=9.74e+06u
-M1002 a_413_47# a_224_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.2475e+11p ps=6.13e+06u
-M1003 a_413_47# a_27_47# Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Z a_27_47# a_340_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_340_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=9.402e+11p ps=7.71e+06u
-M1006 VGND a_224_47# a_413_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1008 VPWR TE_B a_340_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_224_47# TE_B VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
-M1010 Z a_27_47# a_413_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_340_309# a_27_47# Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_340_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Z a_27_47# a_340_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_413_47# a_224_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_224_47# a_413_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR TE_B a_340_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_224_47# TE_B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1018 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1019 a_413_47# a_27_47# Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_340_309# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X1 VPWR TE_B a_340_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X2 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 Z a_27_47# a_413_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR TE_B a_224_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_413_47# a_27_47# Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Z a_27_47# a_340_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 Z a_27_47# a_340_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_340_309# a_27_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND a_224_47# a_413_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_340_309# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X11 VGND a_224_47# a_413_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_413_47# a_27_47# Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VPWR TE_B a_340_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X14 a_340_309# a_27_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VGND TE_B a_224_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 Z a_27_47# a_413_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 a_413_47# a_224_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_413_47# a_224_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.cdl b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.cdl
index 0e5d425..d827747 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.cdl
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__ebufn_8 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z net35 VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z net35 VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA net39 VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net39 TE_B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net35 A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB phighvt m=8 w=0.94 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net35 VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
+MMN1 sndA net39 VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 net39 TE_B VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN1 net39 TE_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net35 A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net35 A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB pfet_01v8_hvt m=8 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net35 VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net39 TE_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net35 A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__ebufn_8
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.netlist.tsv b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.netlist.tsv
index f6b9ca2..4c5134a 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.netlist.tsv
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__ebufn_8	A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMN0	MOSFET	Z	net35	sndA	VNB	nshort	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net39	VGND	VNB	nshort	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net39	TE_B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net35	A	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	phighvt	8	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net35	Z	VPB	phighvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net39	TE_B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net35	A	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net35	sndA	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net39	VGND	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net39	TE_B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net35	A	VGND	VNB	nfet_01v8	2	0.65	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	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net35	Z	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net39	TE_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net35	A	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.spice b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.spice
index 16d02ed..440ae2e 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.spice
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_hdll__ebufn_8 A TE_B VGND VNB VPB VPWR Z
-M1000 VPWR TE_B a_437_309# VPB phighvt w=940000u l=180000u
-+  ad=1.9584e+12p pd=1.56e+07u as=3.2075e+12p ps=2.41e+07u
-M1001 VPWR TE_B a_437_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_437_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_437_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_485_47# a_124_297# Z VNB nshort w=650000u l=150000u
-+  ad=2.106e+12p pd=1.818e+07u as=8.645e+11p ps=7.86e+06u
-M1005 VPWR A a_124_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1006 a_437_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_321_47# TE_B VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=1.417e+12p ps=1.216e+07u
-M1008 a_437_309# a_124_297# Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1009 a_485_47# a_321_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_485_47# a_321_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_485_47# a_124_297# Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR TE_B a_437_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_124_297# A VGND VNB nshort w=650000u l=150000u
-+  ad=2.08e+11p pd=1.94e+06u as=0p ps=0u
-M1014 a_321_47# TE_B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1015 Z a_124_297# a_437_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR TE_B a_437_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Z a_124_297# a_437_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_321_47# a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_485_47# a_321_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_437_309# a_124_297# Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_437_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_321_47# a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Z a_124_297# a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Z a_124_297# a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_485_47# a_124_297# Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A a_124_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_485_47# a_124_297# Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_437_309# a_124_297# Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Z a_124_297# a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_437_309# a_124_297# Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Z a_124_297# a_437_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND a_321_47# a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_124_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND a_321_47# a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 Z a_124_297# a_437_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_485_47# a_321_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Z a_124_297# a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_437_309# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X1 a_437_309# a_124_297# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_124_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 Z a_124_297# a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 Z a_124_297# a_437_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_485_47# a_321_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VGND a_321_47# a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Z a_124_297# a_437_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 Z a_124_297# a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VPWR TE_B a_437_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X10 VGND A a_124_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_485_47# a_124_297# Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_485_47# a_321_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_124_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_485_47# a_124_297# Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_437_309# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X16 a_437_309# a_124_297# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 VGND TE_B a_321_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 a_485_47# a_321_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 Z a_124_297# a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 VPWR TE_B a_321_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 a_437_309# a_124_297# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 a_485_47# a_124_297# Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VPWR TE_B a_437_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X24 VPWR A a_124_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 a_437_309# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X26 a_485_47# a_321_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 VPWR TE_B a_437_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X28 Z a_124_297# a_437_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 a_485_47# a_124_297# Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 Z a_124_297# a_437_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 Z a_124_297# a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X32 a_437_309# a_124_297# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 VGND a_321_47# a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X34 VGND a_321_47# a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X35 a_437_309# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X36 VGND a_321_47# a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X37 VPWR TE_B a_437_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_1.cdl b/cells/einvn/sky130_fd_sc_hdll__einvn_1.cdl
index 69cb03a..5ceafde 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_1.cdl
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__einvn_1 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA net25 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net25 TE_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB 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
-MMIP1 net25 TE_B VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMN1 sndA net25 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 net25 TE_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net25 TE_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__einvn_1
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_1.netlist.tsv b/cells/einvn/sky130_fd_sc_hdll__einvn_1.netlist.tsv
index 81632f4..647426d 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_1.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net25	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net25	TE_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net25	TE_B	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net25	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net25	TE_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net25	TE_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_1.spice b/cells/einvn/sky130_fd_sc_hdll__einvn_1.spice
index 7ecdf55..6939e4c 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_1.spice
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hdll__einvn_1 A TE_B VGND VNB VPB VPWR Z
-M1000 a_316_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=3.8025e+11p pd=2.47e+06u as=5.255e+11p ps=2.97e+06u
-M1001 VPWR TE_B a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=3.144e+11p pd=2.69e+06u as=1.728e+11p ps=1.82e+06u
-M1002 VGND TE_B a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1003 Z A a_222_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=1.065e+12p ps=4.13e+06u
-M1004 a_222_297# TE_B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Z A a_316_47# VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
+X0 a_27_47# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X1 VGND a_27_47# a_316_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_316_47# A Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_222_297# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VPWR TE_B a_222_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_27_47# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_2.cdl b/cells/einvn/sky130_fd_sc_hdll__einvn_2.cdl
index ba6c4d8..a22a85f 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_2.cdl
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__einvn_2 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB phighvt m=2 w=0.94 l=0.18 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TE TE_B VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB pfet_01v8_hvt m=2 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 TE TE_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__einvn_2
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_2.netlist.tsv b/cells/einvn/sky130_fd_sc_hdll__einvn_2.netlist.tsv
index c0b9f45..73951ec 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_2.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	2	0.65	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	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TE	TE_B	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	2	0.65	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	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_2.spice b/cells/einvn/sky130_fd_sc_hdll__einvn_2.spice
index a887da8..c1d5852 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_2.spice
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__einvn_2 A TE_B VGND VNB VPB VPWR Z
-M1000 VPWR TE_B a_222_309# VPB phighvt w=940000u l=180000u
-+  ad=5.526e+11p pd=4.99e+06u as=5.626e+11p ps=5.04e+06u
-M1001 VPWR TE_B a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1002 a_222_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_234_47# A Z VNB nshort w=650000u l=150000u
-+  ad=6.5975e+11p pd=5.93e+06u as=2.08e+11p ps=1.94e+06u
-M1004 VGND TE_B a_27_47# VNB nshort w=420000u l=150000u
-+  ad=2.847e+11p pd=3.2e+06u as=1.302e+11p ps=1.46e+06u
-M1005 a_234_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_27_47# a_234_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Z A a_222_309# VPB phighvt w=1e+06u l=180000u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1008 Z A a_234_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_222_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_47# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X1 Z A a_234_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_222_309# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X3 VPWR TE_B a_222_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X4 a_222_309# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_27_47# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_27_47# a_234_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_234_47# A Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 Z A a_222_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_234_47# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_4.cdl b/cells/einvn/sky130_fd_sc_hdll__einvn_4.cdl
index 067336d..663a059 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_4.cdl
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__einvn_4 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 TE TE_B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB phighvt m=4 w=0.94 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN1 TE TE_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TE TE_B 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
+MMP0 VPWR TE_B VPB pfet_01v8_hvt m=4 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 TE TE_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__einvn_4
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_4.netlist.tsv b/cells/einvn/sky130_fd_sc_hdll__einvn_4.netlist.tsv
index cb191ae..2b17cf5 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_4.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TE	TE_B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	phighvt	4	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TE	TE_B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	4	0.65	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.65	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	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TE	TE_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_4.spice b/cells/einvn/sky130_fd_sc_hdll__einvn_4.spice
index eca6715..b9ead1e 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_4.spice
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_hdll__einvn_4 A TE_B VGND VNB VPB VPWR Z
-M1000 VPWR TE_B a_222_309# VPB phighvt w=940000u l=180000u
-+  ad=8.663e+11p pd=7.57e+06u as=1.3752e+12p ps=1.258e+07u
-M1001 a_235_47# A Z VNB nshort w=650000u l=150000u
-+  ad=1.04325e+12p pd=9.71e+06u as=4.16e+11p ps=3.88e+06u
-M1002 Z A a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_222_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_235_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=6.175e+11p ps=5.8e+06u
-M1005 VGND a_27_47# a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR TE_B a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1007 a_222_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1008 a_235_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_235_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Z A a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Z A a_222_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_222_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_27_47# a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR TE_B a_222_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_222_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND TE_B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1017 Z A a_222_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Z A a_222_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_27_47# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_222_309# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X3 VGND a_27_47# a_235_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 Z A a_235_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VPWR TE_B a_222_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X6 Z A a_235_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_222_309# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_222_309# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X9 a_235_47# A Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VGND a_27_47# a_235_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_235_47# A Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_27_47# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_235_47# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 Z A a_222_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VPWR TE_B a_222_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X16 a_222_309# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_235_47# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_8.cdl b/cells/einvn/sky130_fd_sc_hdll__einvn_8.cdl
index 267e487..c10897d 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_8.cdl
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__einvn_8 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 TE TE_B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB phighvt m=8 w=0.94 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN1 TE TE_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TE TE_B 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
+MMP0 VPWR TE_B VPB pfet_01v8_hvt m=8 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 TE TE_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__einvn_8
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_8.netlist.tsv b/cells/einvn/sky130_fd_sc_hdll__einvn_8.netlist.tsv
index 752629a..a847f9d 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_8.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_8.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TE	TE_B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	phighvt	8	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TE	TE_B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	8	0.65	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.65	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	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TE	TE_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_8.spice b/cells/einvn/sky130_fd_sc_hdll__einvn_8.spice
index baf123d..242e1f6 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_8.spice
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_8.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_hdll__einvn_8 A TE_B VGND VNB VPB VPWR Z
-M1000 VPWR TE_B a_222_309# VPB phighvt w=940000u l=180000u
-+  ad=1.4115e+12p pd=1.249e+07u as=2.5004e+12p ps=2.266e+07u
-M1001 Z A a_222_309# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=0p ps=0u
-M1002 VPWR TE_B a_222_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Z A a_222_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_235_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.8005e+12p pd=1.724e+07u as=1.04325e+12p ps=9.71e+06u
-M1005 a_222_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_222_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_27_47# a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_235_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Z A a_235_47# VNB nshort w=650000u l=150000u
-+  ad=8.645e+11p pd=7.86e+06u as=0p ps=0u
-M1010 a_235_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_222_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR TE_B a_222_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Z A a_222_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR TE_B a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1015 VGND a_27_47# a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_222_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_222_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_235_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Z A a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_235_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_235_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Z A a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Z A a_222_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND TE_B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1025 VGND a_27_47# a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR TE_B a_222_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_222_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_235_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND a_27_47# a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Z A a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_222_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_222_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_235_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_235_47# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 Z A a_222_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_235_47# A Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND a_27_47# a_235_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR TE_B a_222_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X5 Z A a_235_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_222_309# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X7 a_27_47# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 Z A a_222_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Z A a_235_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_222_309# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X11 a_222_309# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VPWR TE_B a_222_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X13 Z A a_235_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_222_309# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_235_47# A Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VGND a_27_47# a_235_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 Z A a_222_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 Z A a_235_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 VPWR TE_B a_222_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X20 a_27_47# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 VGND a_27_47# a_235_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_222_309# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X23 Z A a_222_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 a_222_309# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 a_222_309# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X26 a_235_47# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 a_235_47# A Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X28 a_222_309# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 a_235_47# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 VGND a_27_47# a_235_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 a_235_47# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X32 a_235_47# A Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X33 VPWR TE_B a_222_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_1.cdl b/cells/einvp/sky130_fd_sc_hdll__einvp_1.cdl
index 255f9f4..cfc71d0 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_1.cdl
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__einvp_1 A TE VGND VNB VPB VPWR Z
 *.PININFO A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TEB VPB phighvt m=1 w=1.0 l=0.18 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.18 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.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TEB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 TEB TE VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__einvp_1
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_1.netlist.tsv b/cells/einvp/sky130_fd_sc_hdll__einvp_1.netlist.tsv
index 12070b6..7257226 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_1.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	1	0.65	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TEB	TE	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	1	0.65	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_1.spice b/cells/einvp/sky130_fd_sc_hdll__einvp_1.spice
index 2f847cf..7759b9c 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_1.spice
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hdll__einvp_1 A TE VGND VNB VPB VPWR Z
-M1000 a_332_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=4.55e+11p pd=2.91e+06u as=8.457e+11p ps=3.79e+06u
-M1001 VPWR TE a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1002 Z A a_204_47# VNB nshort w=650000u l=150000u
-+  ad=2.08e+11p pd=1.94e+06u as=7.0525e+11p ps=3.47e+06u
-M1003 VGND TE a_27_47# VNB nshort w=420000u l=150000u
-+  ad=1.94e+11p pd=1.95e+06u as=1.092e+11p ps=1.36e+06u
-M1004 Z A a_332_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1005 a_204_47# TE VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_47# TE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 a_204_47# A Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VGND TE a_204_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_332_297# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VPWR a_27_47# a_332_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_27_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_2.cdl b/cells/einvp/sky130_fd_sc_hdll__einvp_2.cdl
index f16b1f7..a842f15 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_2.cdl
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__einvp_2 A TE VGND VNB VPB VPWR Z
 *.PININFO A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TEB VPB phighvt m=2 w=0.94 l=0.18 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TEB TE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TEB VPB pfet_01v8_hvt m=2 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 TEB TE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__einvp_2
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_2.netlist.tsv b/cells/einvp/sky130_fd_sc_hdll__einvp_2.netlist.tsv
index 591abcf..7668a82 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_2.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	2	0.65	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	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TEB	TE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	2	0.65	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	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_2.spice b/cells/einvp/sky130_fd_sc_hdll__einvp_2.spice
index 43fbeb0..bc4f388 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_2.spice
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__einvp_2 A TE VGND VNB VPB VPWR Z
-M1000 Z A a_214_47# VNB nshort w=650000u l=150000u
-+  ad=2.405e+11p pd=2.04e+06u as=6.0775e+11p ps=5.77e+06u
-M1001 VPWR a_27_47# a_235_309# VPB phighvt w=940000u l=180000u
-+  ad=4.454e+11p pd=4.28e+06u as=9.587e+11p ps=7.84e+06u
-M1002 VPWR TE a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1003 a_235_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1004 VGND TE a_214_47# VNB nshort w=650000u l=150000u
-+  ad=4.1e+11p pd=3.95e+06u as=0p ps=0u
-M1005 a_214_47# TE VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_214_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Z A a_235_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND TE a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1009 a_235_309# a_27_47# VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_47# TE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X1 VGND TE a_214_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 Z A a_235_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_235_309# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Z A a_214_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VPWR a_27_47# a_235_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X6 a_235_309# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X7 a_214_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_27_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_214_47# A Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_4.cdl b/cells/einvp/sky130_fd_sc_hdll__einvp_4.cdl
index 6a4c579..cc91aa9 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_4.cdl
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__einvp_4 A TE VGND VNB VPB VPWR Z
 *.PININFO A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 TEB TE VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TEB VPB phighvt m=4 w=0.94 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN1 TEB TE VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TEB TE 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
+MMP0 VPWR TEB VPB pfet_01v8_hvt m=4 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 TEB TE VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__einvp_4
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_4.netlist.tsv b/cells/einvp/sky130_fd_sc_hdll__einvp_4.netlist.tsv
index 90f0b13..561daa4 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_4.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TEB	TE	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	phighvt	4	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TEB	TE	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TEB	TE	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	pfet_01v8_hvt	4	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TEB	TE	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_4.spice b/cells/einvp/sky130_fd_sc_hdll__einvp_4.spice
index e330ed3..890fea0 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_4.spice
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_hdll__einvp_4 A TE VGND VNB VPB VPWR Z
-M1000 a_213_47# TE VGND VNB nshort w=650000u l=150000u
-+  ad=1.0205e+12p pd=9.64e+06u as=5.98e+11p ps=5.74e+06u
-M1001 a_213_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1002 Z A a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_27_47# a_235_309# VPB phighvt w=940000u l=180000u
-+  ad=8.152e+11p pd=7.46e+06u as=1.4263e+12p ps=1.269e+07u
-M1004 VPWR TE a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1005 a_235_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1006 VGND TE a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_213_47# TE VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_213_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Z A a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND TE a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_235_309# a_27_47# VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Z A a_235_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND TE a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1014 a_235_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_27_47# a_235_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_235_309# a_27_47# VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Z A a_235_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Z A a_235_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_27_47# TE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VPWR a_27_47# a_235_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X3 VGND TE a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 Z A a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_235_309# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X6 VGND TE a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Z A a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_235_309# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_27_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_213_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_213_47# A Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VPWR a_27_47# a_235_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X13 a_235_309# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X14 a_213_47# A Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 Z A a_235_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_235_309# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_213_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_8.cdl b/cells/einvp/sky130_fd_sc_hdll__einvp_8.cdl
index ecd3b9c..3d3653b 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_8.cdl
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__einvp_8 A TE VGND VNB VPB VPWR Z
 *.PININFO A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 TEB TE VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TEB VPB phighvt m=8 w=0.94 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN1 TEB TE VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TEB TE 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
+MMP0 VPWR TEB VPB pfet_01v8_hvt m=8 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 TEB TE VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__einvp_8
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_8.netlist.tsv b/cells/einvp/sky130_fd_sc_hdll__einvp_8.netlist.tsv
index e051baf..14cfb5a 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_8.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_8.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TEB	TE	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	phighvt	8	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TEB	TE	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TEB	TE	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	pfet_01v8_hvt	8	0.94	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TEB	TE	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_8.spice b/cells/einvp/sky130_fd_sc_hdll__einvp_8.spice
index 5e8a49e..2852335 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_8.spice
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_8.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_hdll__einvp_8 A TE VGND VNB VPB VPWR Z
-M1000 Z A a_235_309# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=2.5515e+12p ps=2.277e+07u
-M1001 a_213_47# TE VGND VNB nshort w=650000u l=150000u
-+  ad=1.885e+12p pd=1.75e+07u as=1.014e+12p ps=9.62e+06u
-M1002 a_213_47# TE VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_27_47# a_235_309# VPB phighvt w=940000u l=180000u
-+  ad=1.3604e+12p pd=1.238e+07u as=0p ps=0u
-M1004 Z A a_235_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_235_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_27_47# a_235_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Z A a_213_47# VNB nshort w=650000u l=150000u
-+  ad=8.32e+11p pd=7.76e+06u as=0p ps=0u
-M1008 a_213_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_235_309# a_27_47# VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND TE a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Z A a_235_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_213_47# TE VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR TE a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1014 VPWR a_27_47# a_235_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_235_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND TE a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Z A a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_235_309# a_27_47# VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_213_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Z A a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Z A a_235_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND TE a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_213_47# TE VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_235_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND TE a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_213_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_27_47# a_235_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Z A a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_235_309# a_27_47# VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_235_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND TE a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1032 a_213_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_235_309# a_27_47# VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Z A a_235_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_213_47# A Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 Z A a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR a_27_47# a_235_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X4 a_213_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_27_47# TE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Z A a_235_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_213_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 Z A a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VPWR a_27_47# a_235_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X10 a_235_309# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_213_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_235_309# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X13 VGND TE a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 Z A a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_235_309# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_213_47# A Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_235_309# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X18 Z A a_235_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 VGND TE a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 VPWR a_27_47# a_235_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X21 a_213_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 VGND TE a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 Z A a_235_309# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 VPWR a_27_47# a_235_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X25 a_235_309# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 Z A a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 a_235_309# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X28 VGND TE a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 a_27_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 a_213_47# A Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 a_235_309# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 a_235_309# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X33 a_213_47# A Z VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.cdl b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.cdl
index 26de734..4c136ce 100644
--- a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.cdl
+++ b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__inputiso0n_1 A SLEEP_B VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP_B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI14 X net36 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MI14 X net36 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 net36 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 net36 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 sndA SLEEP_B VNB 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
-MMP1 net36 SLEEP_B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 net36 SLEEP_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 X net36 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
-MI17 net36 A 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
+MI19 X net36 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 net36 A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inputiso0n_1
diff --git a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.netlist.tsv b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.netlist.tsv
index 47b6f62..69e9d95 100644
--- a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.netlist.tsv
+++ b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__inputiso0n_1	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	net36	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	net36	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
-MMP1	MOSFET	net36	SLEEP_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	X	net36	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	net36	A	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	X	net36	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	net36	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
+MMP1	MOSFET	net36	SLEEP_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	X	net36	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	net36	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.spice b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.spice
index e39f906..7f17aa1 100644
--- a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.spice
+++ b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hdll__inputiso0n_1 A SLEEP_B VGND VNB VPB VPWR X
-M1000 X a_27_75# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.7e+11p pd=2.74e+06u as=4.691e+11p ps=4.24e+06u
-M1001 X a_27_75# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=2.446e+11p ps=2.18e+06u
-M1002 a_27_75# A VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1003 VGND SLEEP_B a_123_75# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1004 VPWR SLEEP_B a_27_75# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_123_75# A a_27_75# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
+X0 VGND a_27_75# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VPWR A a_27_75# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 a_27_75# A a_123_75# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_123_75# SLEEP_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR a_27_75# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_27_75# SLEEP_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.cdl b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.cdl
index f1a81e8..e0fd1f5 100644
--- a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.cdl
+++ b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__inputiso0p_1 A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI8 net36 A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI8 net36 A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net36 sleepb VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 X net36 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 sleepb SLEEP VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net36 sleepb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI21 X net36 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net36 sleepb VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI18 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
-MI20 X net36 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
-MI19 sleepb SLEEP 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
-MI10 net36 sleepb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 X net36 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 sleepb SLEEP VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 sndA A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 sndA A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inputiso0p_1
diff --git a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.netlist.tsv b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.netlist.tsv
index 9edf7d9..90a8431 100644
--- a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.netlist.tsv
+++ b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__inputiso0p_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
-MI8	MOSFET	net36	A	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net36	sleepb	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	X	net36	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	sleepb	SLEEP	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net36	sleepb	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	X	net36	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	sleepb	SLEEP	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	sndA	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net36	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net36	sleepb	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	X	net36	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	sleepb	SLEEP	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net36	sleepb	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	X	net36	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	sleepb	SLEEP	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	sndA	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/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.spice b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.spice
index 8454707..785424c 100644
--- a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.spice
+++ b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__inputiso0p_1 A SLEEP VGND VNB VPB VPWR X
-M1000 VGND A a_307_47# VNB nshort w=420000u l=150000u
-+  ad=4.197e+11p pd=3.81e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR SLEEP a_27_413# VPB phighvt w=420000u l=180000u
-+  ad=6.233e+11p pd=5.09e+06u as=1.134e+11p ps=1.38e+06u
-M1002 VPWR A a_211_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1003 X a_211_413# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1004 X a_211_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1005 a_27_413# SLEEP VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1006 a_211_413# a_27_413# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_307_47# a_27_413# a_211_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
+X0 a_211_413# a_27_413# a_307_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_27_413# SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 VGND a_211_413# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR a_211_413# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VPWR a_27_413# a_211_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 VGND SLEEP a_27_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_211_413# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 a_307_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.cdl b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.cdl
index 23c0091..9780a85 100644
--- a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.cdl
+++ b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__inputiso1n_1 A SLEEP_B VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP_B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI23 VPWR A VPB 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 VPWR net44 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
-MMIP0 net56 SLEEP_B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI23 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 sndPA net56 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
-MMIN0 net56 SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI8 VPWR net44 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net44 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 net56 SLEEP_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 sndPA net56 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 net56 SLEEP_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net44 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X net44 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X net44 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net44 net56 VNB nshort m=1 w=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 net44 net56 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inputiso1n_1
diff --git a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.netlist.tsv b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.netlist.tsv
index 9190d0d..2077abc 100644
--- a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.netlist.tsv
+++ b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__inputiso1n_1	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	A	sndPA	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	VPWR	net44	X	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	net56	SLEEP_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	sndPA	net56	net44	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	net56	SLEEP_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net44	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	net44	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net44	net56	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	VPWR	net44	X	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	net56	SLEEP_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	sndPA	net56	net44	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	net56	SLEEP_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net44	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	net44	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net44	net56	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_hdll__inputiso1n_1.spice b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.spice
index 7978522..4023242 100644
--- a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.spice
+++ b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__inputiso1n_1 A SLEEP_B VGND VNB VPB VPWR X
-M1000 VGND SLEEP_B a_27_53# VNB nshort w=420000u l=150000u
-+  ad=5.9745e+11p pd=4.64e+06u as=1.302e+11p ps=1.46e+06u
-M1001 VPWR A a_319_297# VPB phighvt w=420000u l=180000u
-+  ad=4.241e+11p pd=4.1e+06u as=1.218e+11p ps=1.42e+06u
-M1002 a_27_53# SLEEP_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1003 a_319_297# a_27_53# a_229_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1004 X a_229_297# VGND VNB nshort w=650000u l=150000u
-+  ad=1.82e+11p pd=1.86e+06u as=0p ps=0u
-M1005 VGND A a_229_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1006 a_229_297# a_27_53# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_229_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
+X0 VGND a_229_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VPWR SLEEP_B a_27_53# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 VPWR a_229_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VGND a_27_53# a_229_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_319_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 a_27_53# SLEEP_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_229_297# a_27_53# a_319_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 a_229_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.cdl b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.cdl
index 27ecb9a..12b41d8 100644
--- a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.cdl
+++ b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__inputiso1p_1 A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR SLEEP VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR SLEEP VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 sndPA A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 VPWR net36 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net36 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 sndPA A 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
-MI15 VPWR net36 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
-MI10 net36 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 net36 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 X net36 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 net36 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 X net36 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inputiso1p_1
diff --git a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.netlist.tsv b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.netlist.tsv
index 0fae08f..08dd26a 100644
--- a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.netlist.tsv
+++ b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__inputiso1p_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	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	sndPA	A	net36	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	VPWR	net36	X	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net36	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net36	SLEEP	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	X	net36	VGND	VNB	nshort	1	0.65	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	sndPA	A	net36	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	VPWR	net36	X	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net36	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net36	SLEEP	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	X	net36	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.spice b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.spice
index 44623a1..f78dc88 100644
--- a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.spice
+++ b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hdll__inputiso1p_1 A SLEEP VGND VNB VPB VPWR X
-M1000 a_44_297# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=3.517e+11p ps=3.53e+06u
-M1001 VPWR SLEEP a_134_297# VPB phighvt w=420000u l=180000u
-+  ad=3.057e+11p pd=2.71e+06u as=1.218e+11p ps=1.42e+06u
-M1002 X a_44_297# VGND VNB nshort w=650000u l=150000u
-+  ad=2.405e+11p pd=2.04e+06u as=0p ps=0u
-M1003 VGND SLEEP a_44_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_134_297# A a_44_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1005 X a_44_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=4.1e+11p pd=2.82e+06u as=0p ps=0u
+X0 a_44_297# SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_134_297# SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 a_44_297# A a_134_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 VGND a_44_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR a_44_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND A a_44_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_1.cdl b/cells/inv/sky130_fd_sc_hdll__inv_1.cdl
index 18f42ba..372b5e7 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_1.cdl
+++ b/cells/inv/sky130_fd_sc_hdll__inv_1.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__inv_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Y A VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inv_1
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_1.netlist.tsv b/cells/inv/sky130_fd_sc_hdll__inv_1.netlist.tsv
index d924a84..ed65fb6 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_1.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_hdll__inv_1.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hdll__inv_1	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Y	A	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.65	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	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_1.spice b/cells/inv/sky130_fd_sc_hdll__inv_1.spice
index 0b2741f..d75eae2 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_1.spice
+++ b/cells/inv/sky130_fd_sc_hdll__inv_1.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_hdll__inv_1 A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=2.015e+11p ps=1.92e+06u
-M1001 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=2.7e+11p ps=2.54e+06u
+X0 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_12.cdl b/cells/inv/sky130_fd_sc_hdll__inv_12.cdl
index 2ebe494..ddc9cb9 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_12.cdl
+++ b/cells/inv/sky130_fd_sc_hdll__inv_12.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__inv_12 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Y A VNB nshort m=12 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y A VNB nfet_01v8 m=12 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Y A VPB phighvt m=12 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inv_12
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_12.netlist.tsv b/cells/inv/sky130_fd_sc_hdll__inv_12.netlist.tsv
index 8681fb2..2a7ca3e 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_12.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_hdll__inv_12.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hdll__inv_12	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	12	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Y	A	VPWR	VPB	phighvt	12	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8	12	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	12	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_12.spice b/cells/inv/sky130_fd_sc_hdll__inv_12.spice
index a51955e..fd44742 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_12.spice
+++ b/cells/inv/sky130_fd_sc_hdll__inv_12.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__inv_12 A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=1.2805e+12p pd=1.174e+07u as=1.3845e+12p ps=1.336e+07u
-M1001 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.74e+12p pd=1.548e+07u as=2e+12p ps=1.8e+07u
-M1003 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_16.cdl b/cells/inv/sky130_fd_sc_hdll__inv_16.cdl
index 3048c0b..e3ca388 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_16.cdl
+++ b/cells/inv/sky130_fd_sc_hdll__inv_16.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__inv_16 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Y A VNB nshort m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y A VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Y A VPB phighvt m=16 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inv_16
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_16.netlist.tsv b/cells/inv/sky130_fd_sc_hdll__inv_16.netlist.tsv
index 51cb165..47dc705 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_16.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_hdll__inv_16.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hdll__inv_16	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	16	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Y	A	VPWR	VPB	phighvt	16	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8	16	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_16.spice b/cells/inv/sky130_fd_sc_hdll__inv_16.spice
index c391909..7c1511e 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_16.spice
+++ b/cells/inv/sky130_fd_sc_hdll__inv_16.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hdll__inv_16 A VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=2.57e+12p pd=2.314e+07u as=2.32e+12p ps=2.064e+07u
-M1001 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=1.664e+12p pd=1.552e+07u as=1.8265e+12p ps=1.732e+07u
-M1005 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X28 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_2.cdl b/cells/inv/sky130_fd_sc_hdll__inv_2.cdl
index b00f593..da0537e 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_2.cdl
+++ b/cells/inv/sky130_fd_sc_hdll__inv_2.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__inv_2 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Y A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Y A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inv_2
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_2.netlist.tsv b/cells/inv/sky130_fd_sc_hdll__inv_2.netlist.tsv
index 79ff60f..01517b2 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_2.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_hdll__inv_2.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hdll__inv_2	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Y	A	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_2.spice b/cells/inv/sky130_fd_sc_hdll__inv_2.spice
index 20b38a2..114352c 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_2.spice
+++ b/cells/inv/sky130_fd_sc_hdll__inv_2.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_hdll__inv_2 A VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=5.4e+11p ps=5.08e+06u
-M1001 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=3.705e+11p pd=3.74e+06u as=2.08e+11p ps=1.94e+06u
-M1002 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_4.cdl b/cells/inv/sky130_fd_sc_hdll__inv_4.cdl
index edbd1ed..98d4d94 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_4.cdl
+++ b/cells/inv/sky130_fd_sc_hdll__inv_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__inv_4 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inv_4
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_4.netlist.tsv b/cells/inv/sky130_fd_sc_hdll__inv_4.netlist.tsv
index e1454f9..bfa2be1 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_4.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_hdll__inv_4.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_4.spice b/cells/inv/sky130_fd_sc_hdll__inv_4.spice
index 22d5748..123b781 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_4.spice
+++ b/cells/inv/sky130_fd_sc_hdll__inv_4.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__inv_4 A VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.075e+12p pd=8.15e+06u as=5.8e+11p ps=5.16e+06u
-M1001 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=7.3775e+11p ps=6.17e+06u
-M1003 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_6.cdl b/cells/inv/sky130_fd_sc_hdll__inv_6.cdl
index 960cb5f..9514fee 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_6.cdl
+++ b/cells/inv/sky130_fd_sc_hdll__inv_6.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__inv_6 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Y A VNB nshort m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y A VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Y A VPB phighvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inv_6
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_6.netlist.tsv b/cells/inv/sky130_fd_sc_hdll__inv_6.netlist.tsv
index 40e4bf9..73394ff 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_6.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_hdll__inv_6.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hdll__inv_6	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Y	A	VPWR	VPB	phighvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_6.spice b/cells/inv/sky130_fd_sc_hdll__inv_6.spice
index 1e1c3e0..ccc5be6 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_6.spice
+++ b/cells/inv/sky130_fd_sc_hdll__inv_6.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__inv_6 A VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.13e+12p pd=1.026e+07u as=8.7e+11p ps=7.74e+06u
-M1001 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=7.605e+11p pd=7.54e+06u as=6.24e+11p ps=5.82e+06u
-M1002 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_8.cdl b/cells/inv/sky130_fd_sc_hdll__inv_8.cdl
index dd3671f..4d17e78 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_8.cdl
+++ b/cells/inv/sky130_fd_sc_hdll__inv_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__inv_8 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y A VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inv_8
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_8.netlist.tsv b/cells/inv/sky130_fd_sc_hdll__inv_8.netlist.tsv
index bdebbb9..4123613 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_8.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_hdll__inv_8.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	8	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_8.spice b/cells/inv/sky130_fd_sc_hdll__inv_8.spice
index a997950..fb5c18d 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_8.spice
+++ b/cells/inv/sky130_fd_sc_hdll__inv_8.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__inv_8 A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=8.645e+11p pd=7.86e+06u as=9.62e+11p ps=9.46e+06u
-M1001 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=1.41e+12p ps=1.282e+07u
-M1002 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.cdl b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.cdl
index 4c04dc3..512b8ed 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.cdl
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__isobufsrc_1 A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR SLEEP VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR SLEEP VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 X SLEEP VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA Ab VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 X Ab VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A 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
-MMN0 X SLEEP VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 X Ab VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Ab A VNB 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_hdll__isobufsrc_1
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.netlist.tsv b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.netlist.tsv
index fcbb268..6f30fed 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.netlist.tsv
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	Ab	X	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	X	SLEEP	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	X	Ab	VGND	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	Ab	X	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	X	SLEEP	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.65	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_hdll__isobufsrc_1.spice b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.spice
index 60cfafa..a8d04d4 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.spice
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hdll__isobufsrc_1 A SLEEP VGND VNB VPB VPWR X
-M1000 VGND a_74_47# X VNB nshort w=650000u l=150000u
-+  ad=4.23e+11p pd=3.99e+06u as=2.08e+11p ps=1.94e+06u
-M1001 a_283_297# SLEEP VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.3e+11p pd=2.46e+06u as=3.288e+11p ps=2.82e+06u
-M1002 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_74_47# a_283_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1004 VGND A a_74_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1005 VPWR A a_74_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
+X0 a_74_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 a_283_297# a_74_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_74_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 X a_74_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR SLEEP a_283_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.cdl b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.cdl
index e0f60cb..373ad67 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.cdl
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__isobufsrc_16 A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR Ab VPB phighvt m=16 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA SLEEP VPB phighvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR Ab VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA SLEEP VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 X SLEEP VNB nshort m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 X SLEEP VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 X Ab VNB nshort m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 X Ab VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Ab A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__isobufsrc_16
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.netlist.tsv b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.netlist.tsv
index c8d8d15..3921fae 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.netlist.tsv
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__isobufsrc_16	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	Ab	sndPA	VPB	phighvt	16	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	SLEEP	X	VPB	phighvt	16	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	X	SLEEP	VGND	VNB	nshort	16	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	X	Ab	VGND	VNB	nshort	16	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Ab	A	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	Ab	sndPA	VPB	pfet_01v8_hvt	16	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	SLEEP	X	VPB	pfet_01v8_hvt	16	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	X	SLEEP	VGND	VNB	nfet_01v8	16	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	X	Ab	VGND	VNB	nfet_01v8	16	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.spice b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.spice
index eab1721..50d11ff 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.spice
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.spice
@@ -16,148 +16,76 @@
 
 
 .subckt sky130_fd_sc_hdll__isobufsrc_16 A SLEEP VGND VNB VPB VPWR X
-M1000 X SLEEP a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.32e+12p pd=2.064e+07u as=4.92e+12p ps=4.384e+07u
-M1001 VPWR A a_151_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.27e+12p pd=2.854e+07u as=6.8e+11p ps=5.36e+06u
-M1002 X a_151_297# VGND VNB nshort w=650000u l=150000u
-+  ad=3.393e+12p pd=3.124e+07u as=4.095e+12p ps=3.73e+07u
-M1003 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X SLEEP a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_151_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_151_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_151_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_151_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_151_297# a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_151_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_585_297# a_151_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_585_297# a_151_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_585_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_151_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_151_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_585_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_151_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_151_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_585_297# a_151_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_151_297# a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_585_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X SLEEP a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_151_297# a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_151_297# a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_151_297# A VGND VNB nshort w=650000u l=150000u
-+  ad=5.135e+11p pd=4.18e+06u as=0p ps=0u
-M1029 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_585_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_585_297# a_151_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 X SLEEP a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 X SLEEP a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND a_151_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_151_297# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR a_151_297# a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 X a_151_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 X a_151_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR a_151_297# a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_585_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_585_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VPWR A a_151_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_585_297# a_151_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 X SLEEP a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 X SLEEP a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 X a_151_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 a_151_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 VGND a_151_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 a_585_297# a_151_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 a_585_297# a_151_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 X SLEEP a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 VGND A a_151_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 VGND a_151_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1061 VGND a_151_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 a_585_297# a_151_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 a_585_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 VPWR a_151_297# a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1067 VPWR a_151_297# a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1068 a_585_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 VGND A a_151_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1071 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_151_297# a_585_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 X SLEEP a_585_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND a_151_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_585_297# a_151_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_585_297# a_151_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 X SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 X SLEEP a_585_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND a_151_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VPWR A a_151_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VPWR a_151_297# a_585_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 X a_151_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_585_297# SLEEP X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_585_297# SLEEP X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_585_297# a_151_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_585_297# SLEEP X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 VGND a_151_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 VPWR A a_151_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 VGND A a_151_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VGND a_151_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 a_585_297# a_151_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 X a_151_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 VPWR a_151_297# a_585_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 a_585_297# SLEEP X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 X SLEEP a_585_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 VGND a_151_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 VGND a_151_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 X SLEEP a_585_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 a_585_297# a_151_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 X a_151_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X34 X SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X35 X SLEEP a_585_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X36 a_151_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X37 VPWR a_151_297# a_585_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X38 VGND A a_151_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X39 X a_151_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X40 X SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X41 X SLEEP a_585_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X42 a_585_297# SLEEP X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X43 VPWR a_151_297# a_585_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X44 a_151_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X45 X a_151_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X46 X SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X47 a_585_297# SLEEP X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X48 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X49 X SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X50 a_151_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X51 a_585_297# a_151_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X52 X SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X53 VPWR a_151_297# a_585_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X54 a_585_297# a_151_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X55 X a_151_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X56 X a_151_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X57 a_585_297# SLEEP X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X58 a_585_297# SLEEP X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X59 a_151_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X60 VGND a_151_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X61 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X62 X SLEEP a_585_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X63 X SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X64 X SLEEP a_585_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X65 X a_151_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X66 a_585_297# a_151_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X67 VGND a_151_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X68 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X69 X SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X70 VPWR a_151_297# a_585_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X71 VPWR a_151_297# a_585_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.cdl b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.cdl
index 3a3db70..5044ecb 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.cdl
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__isobufsrc_2 A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR SLEEP VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR SLEEP VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA Ab VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 X SLEEP VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA Ab VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 X Ab VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A 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
-MMN0 X SLEEP VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 X Ab VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Ab A VNB 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_hdll__isobufsrc_2
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.netlist.tsv b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.netlist.tsv
index f6b9d5f..996de87 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.netlist.tsv
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	Ab	X	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	X	SLEEP	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	X	Ab	VGND	VNB	nshort	2	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	Ab	X	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	X	SLEEP	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	X	Ab	VGND	VNB	nfet_01v8	2	0.65	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_hdll__isobufsrc_2.spice b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.spice
index 0e22013..16bf1c5 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.spice
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__isobufsrc_2 A SLEEP VGND VNB VPB VPWR X
-M1000 VPWR SLEEP a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=4.034e+11p pd=3.96e+06u as=8.5e+11p ps=7.7e+06u
-M1001 VGND A a_271_21# VNB nshort w=420000u l=150000u
-+  ad=6.5345e+11p pd=6.97e+06u as=1.092e+11p ps=1.36e+06u
-M1002 a_27_297# a_271_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1003 X a_271_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=4.81e+11p pd=4.08e+06u as=0p ps=0u
-M1005 VGND a_271_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_271_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1007 a_27_297# SLEEP VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_271_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_271_21# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 X a_271_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_27_297# SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 X a_271_21# a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_271_21# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 VGND a_271_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_27_297# a_271_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR SLEEP a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.cdl b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.cdl
index da8a837..1ea48d0 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.cdl
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__isobufsrc_4 A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR SLEEP VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR SLEEP VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA Ab VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA Ab VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN0 X SLEEP VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 X Ab VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 X SLEEP VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 X Ab VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Ab A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__isobufsrc_4
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.netlist.tsv b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.netlist.tsv
index 126aba0..66d65c1 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.netlist.tsv
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	Ab	X	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	X	SLEEP	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	X	Ab	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Ab	A	VGND	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	Ab	X	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	X	SLEEP	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	X	Ab	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.spice b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.spice
index 3cdf866..7d044e4 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.spice
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_hdll__isobufsrc_4 A SLEEP VGND VNB VPB VPWR X
-M1000 X a_459_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.45e+12p ps=1.29e+07u
-M1001 VPWR SLEEP a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=0p ps=0u
-M1002 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=1.1505e+12p pd=1.134e+07u as=8.97e+11p ps=7.96e+06u
-M1003 a_27_297# SLEEP VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_459_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_459_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR SLEEP a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# a_459_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A a_459_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1011 VGND A a_459_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.82e+11p ps=1.86e+06u
-M1012 a_27_297# SLEEP VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_459_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_459_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_459_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_297# a_459_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_459_21# a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND a_459_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 X SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND a_459_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_459_21# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 X SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_27_297# SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_27_297# a_459_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR SLEEP a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 X a_459_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 X a_459_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 X a_459_21# a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_27_297# a_459_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_27_297# SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_459_21# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VPWR SLEEP a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.cdl b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.cdl
index d43ecdb..38f3932 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.cdl
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__isobufsrc_8 A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR Ab VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR Ab VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA SLEEP VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA SLEEP VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN0 X SLEEP VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 X Ab VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 X SLEEP VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 X Ab VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Ab A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__isobufsrc_8
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.netlist.tsv b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.netlist.tsv
index 923355f..f2d719b 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.netlist.tsv
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__isobufsrc_8	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	Ab	sndPA	VPB	phighvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	SLEEP	X	VPB	phighvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	X	SLEEP	VGND	VNB	nshort	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	X	Ab	VGND	VNB	nshort	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Ab	A	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	Ab	sndPA	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	SLEEP	X	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	X	SLEEP	VGND	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	X	Ab	VGND	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.spice b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.spice
index 3ac5e33..ea676f6 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.spice
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_hdll__isobufsrc_8 A SLEEP VGND VNB VPB VPWR X
-M1000 VPWR a_117_297# a_345_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.76e+12p pd=1.552e+07u as=2.6e+12p ps=2.32e+07u
-M1001 VPWR A a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.4e+11p ps=2.68e+06u
-M1002 a_345_297# a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_345_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1004 a_345_297# a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_117_297# a_345_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=1.729e+12p pd=1.572e+07u as=2.249e+12p ps=1.992e+07u
-M1007 X SLEEP a_345_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_345_297# a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_345_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_117_297# a_345_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A a_117_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1019 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X SLEEP a_345_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_345_297# a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_345_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_117_297# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_345_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_117_297# a_345_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 X SLEEP a_345_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 X SLEEP a_345_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_345_297# a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 X SLEEP a_345_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 X SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR a_117_297# a_345_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 X SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 X SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_345_297# SLEEP X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VPWR A a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR a_117_297# a_345_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_345_297# a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_345_297# SLEEP X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_117_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 X SLEEP a_345_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_117_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VPWR a_117_297# a_345_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 X SLEEP a_345_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 VPWR a_117_297# a_345_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 a_345_297# SLEEP X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X28 a_345_297# SLEEP X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 X SLEEP a_345_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 X SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X33 a_345_297# a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X34 VGND A a_117_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X35 a_345_297# a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_1.cdl b/cells/mux2/sky130_fd_sc_hdll__mux2_1.cdl
index 6049cea..63dd15c 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_1.cdl
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__mux2_1 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB 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
-MMPA01 sndPS A0 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
-MMPA10 VPWR Sb 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
-MMPA11 sndPSb A1 VPB phighvt m=1 w=0.42 l=0.18 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.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X xb VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__mux2_1
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_1.netlist.tsv b/cells/mux2/sky130_fd_sc_hdll__mux2_1.netlist.tsv
index 1a53ffc..4a4c3e7 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_1.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.65	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	1	1.0	0.18	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.65	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_1.spice b/cells/mux2/sky130_fd_sc_hdll__mux2_1.spice
index 2256115..a6c7fbe 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_1.spice
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__mux2_1 A0 A1 S VGND VNB VPB VPWR X
-M1000 a_245_47# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=4.745e+11p ps=4.06e+06u
-M1001 VGND a_657_21# a_499_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.318e+11p ps=2.42e+06u
-M1002 a_79_21# A0 a_243_374# VPB phighvt w=420000u l=180000u
-+  ad=4.515e+11p pd=2.99e+06u as=1.743e+11p ps=1.67e+06u
-M1003 a_613_374# A1 a_79_21# VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=0p ps=0u
-M1004 a_79_21# A1 a_245_47# VNB nshort w=420000u l=150000u
-+  ad=2.562e+11p pd=2.06e+06u as=0p ps=0u
-M1005 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=4.926e+11p pd=4.44e+06u as=2.7e+11p ps=2.54e+06u
-M1006 VPWR a_657_21# a_613_374# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_499_47# A0 a_79_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_657_21# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1009 a_243_374# S VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1011 a_657_21# S VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
+X0 VPWR S a_243_374# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 a_499_47# a_657_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_79_21# A1 a_613_374# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 X a_79_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND S a_657_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND S a_245_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 X a_79_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VPWR S a_657_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X8 a_243_374# A0 a_79_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X9 a_245_47# A1 a_79_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_613_374# a_657_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X11 a_79_21# A0 a_499_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_12.cdl b/cells/mux2/sky130_fd_sc_hdll__mux2_12.cdl
index 3980aa7..f25379d 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_12.cdl
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_12.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__mux2_12 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 xb A0 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA10 xb A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA11 sndNA1 S VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X xb VNB nfet_01v8 m=12 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA00 VPWR S VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nshort m=12 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB phighvt m=12 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X xb VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__mux2_12
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_12.netlist.tsv b/cells/mux2/sky130_fd_sc_hdll__mux2_12.netlist.tsv
index 8abe62d..607fd1a 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_12.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_12.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__mux2_12	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	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	xb	A1	sndNA1	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nshort	12	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	12	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	xb	A0	smdNA0	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	xb	A1	sndNA1	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8	12	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	VPWR	VPB	pfet_01v8_hvt	12	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_12.spice b/cells/mux2/sky130_fd_sc_hdll__mux2_12.spice
index 17b678d..5c9d5bb 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_12.spice
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_12.spice
@@ -16,124 +16,64 @@
 
 
 .subckt sky130_fd_sc_hdll__mux2_12 A0 A1 S VGND VNB VPB VPWR X
-M1000 a_119_47# S VGND VNB nshort w=650000u l=150000u
-+  ad=7.02e+11p pd=7.36e+06u as=2.9705e+12p ps=2.604e+07u
-M1001 VGND a_973_297# a_1163_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.02e+11p ps=7.36e+06u
-M1002 a_27_47# A1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.66e+12p pd=1.532e+07u as=1.16e+12p ps=1.032e+07u
-M1003 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=3.69e+12p pd=3.338e+07u as=1.74e+12p ps=1.548e+07u
-M1004 a_27_47# A0 a_1163_47# VNB nshort w=650000u l=150000u
-+  ad=1.287e+12p pd=1.176e+07u as=0p ps=0u
-M1005 a_117_297# a_973_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR S a_597_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1007 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_597_297# A0 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1163_47# a_973_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_47# A0 a_597_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1163_47# A0 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR S a_973_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1013 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.053e+12p pd=1.104e+07u as=0p ps=0u
-M1015 a_597_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_47# A1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_597_297# A0 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND S a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_119_47# S VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_973_297# a_1163_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_117_297# A1 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_973_297# a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_47# A0 a_597_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_973_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_27_47# A1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_117_297# a_973_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_973_297# S VGND VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=0p ps=0u
-M1039 VGND S a_973_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_119_47# A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_27_47# A0 a_1163_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR S a_597_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_1163_47# a_973_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_1163_47# A0 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_117_297# A1 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VPWR a_973_297# a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 a_27_47# A1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 VGND S a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 a_597_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 a_119_47# A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR S a_597_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_27_47# A1 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_117_297# a_973_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_597_297# A0 a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_27_47# A1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_973_297# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_119_47# S VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_973_297# S VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_27_47# A0 a_1163_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_117_297# A1 a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_597_297# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 a_119_47# S VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 a_27_47# A1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 a_1163_47# a_973_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 a_27_47# A0 a_1163_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 VPWR a_973_297# a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 a_27_47# A0 a_597_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X28 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 a_117_297# a_973_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 a_27_47# A0 a_597_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 a_119_47# A1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X33 VPWR S a_973_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X34 a_27_47# A1 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X35 VGND a_973_297# a_1163_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X36 a_1163_47# a_973_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X37 a_597_297# A0 a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X38 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X39 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X40 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X41 VGND S a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X42 a_1163_47# A0 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X43 a_119_47# A1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X44 VPWR S a_597_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X45 VGND a_973_297# a_1163_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X46 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X47 a_117_297# A1 a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X48 VGND S a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X49 a_1163_47# A0 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X50 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X51 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X52 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X53 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X54 VPWR a_973_297# a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X55 VGND S a_973_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X56 a_597_297# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X57 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X58 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X59 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_16.cdl b/cells/mux2/sky130_fd_sc_hdll__mux2_16.cdl
index 65b1d6f..744a590 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_16.cdl
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_16.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__mux2_16 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 xb A0 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA10 xb A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA11 sndNA1 S VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X xb VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA00 VPWR S VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nshort m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB phighvt m=16 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X xb VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__mux2_16
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_16.netlist.tsv b/cells/mux2/sky130_fd_sc_hdll__mux2_16.netlist.tsv
index 1f590cd..32e6219 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_16.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_16.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__mux2_16	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	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	xb	A1	sndNA1	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nshort	16	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	16	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	xb	A0	smdNA0	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	xb	A1	sndNA1	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8	16	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	VPWR	VPB	pfet_01v8_hvt	16	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_16.spice b/cells/mux2/sky130_fd_sc_hdll__mux2_16.spice
index df2da26..f7465fb 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_16.spice
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_16.spice
@@ -16,140 +16,72 @@
 
 
 .subckt sky130_fd_sc_hdll__mux2_16 A0 A1 S VGND VNB VPB VPWR X
-M1000 a_119_47# S VGND VNB nshort w=650000u l=150000u
-+  ad=7.02e+11p pd=7.36e+06u as=3.4515e+12p ps=3.012e+07u
-M1001 VGND a_973_297# a_1163_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.02e+11p ps=7.36e+06u
-M1002 a_27_47# A1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.66e+12p pd=1.532e+07u as=1.16e+12p ps=1.032e+07u
-M1003 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=4.27e+12p pd=3.854e+07u as=2.32e+12p ps=2.064e+07u
-M1004 a_27_47# A0 a_1163_47# VNB nshort w=650000u l=150000u
-+  ad=1.287e+12p pd=1.176e+07u as=0p ps=0u
-M1005 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.404e+12p ps=1.472e+07u
-M1006 a_117_297# a_973_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR S a_597_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1008 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_597_297# A0 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1163_47# a_973_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_47# A0 a_597_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1163_47# A0 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR S a_973_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1014 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_597_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_47# A1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_597_297# A0 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND S a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_119_47# S VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_973_297# a_1163_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_117_297# A1 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR a_973_297# a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_27_47# A0 a_597_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_973_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_27_47# A1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_117_297# a_973_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_973_297# S VGND VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=0p ps=0u
-M1043 VGND S a_973_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_119_47# A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_27_47# A0 a_1163_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VPWR S a_597_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 a_1163_47# a_973_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 a_1163_47# A0 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 a_117_297# A1 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 VPWR a_973_297# a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 a_27_47# A1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1061 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 VGND S a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 a_597_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 a_119_47# A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1067 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR S a_597_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_27_47# A1 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_117_297# a_973_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_597_297# A0 a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_27_47# A1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_973_297# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_119_47# S VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_973_297# S VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_27_47# A0 a_1163_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_117_297# A1 a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 a_597_297# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 a_119_47# S VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_27_47# A1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 a_1163_47# a_973_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 a_27_47# A0 a_1163_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 VPWR a_973_297# a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 a_27_47# A0 a_597_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X34 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 a_117_297# a_973_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X36 a_27_47# A0 a_597_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X37 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X38 a_119_47# A1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X39 VPWR S a_973_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X40 a_27_47# A1 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X41 VGND a_973_297# a_1163_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X42 a_1163_47# a_973_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X43 a_597_297# A0 a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X44 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X45 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X46 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X47 VGND S a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X48 a_1163_47# A0 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X49 a_119_47# A1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X50 VPWR S a_597_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X51 VGND a_973_297# a_1163_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X52 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X53 a_117_297# A1 a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X54 VGND S a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X55 a_1163_47# A0 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X56 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X57 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X58 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X59 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X60 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X61 VPWR a_973_297# a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X62 VGND S a_973_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X63 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X64 a_597_297# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X65 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X66 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X67 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_2.cdl b/cells/mux2/sky130_fd_sc_hdll__mux2_2.cdl
index f960fa3..a16846a 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_2.cdl
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__mux2_2 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB phighvt m=1 w=0.64 l=0.18 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.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X xb VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__mux2_2
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_2.netlist.tsv b/cells/mux2/sky130_fd_sc_hdll__mux2_2.netlist.tsv
index 9a77794..9764756 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_2.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.65	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	2	1.0	0.18	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.65	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_2.spice b/cells/mux2/sky130_fd_sc_hdll__mux2_2.spice
index 6f8bf01..f6872b5 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_2.spice
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_hdll__mux2_2 A0 A1 S VGND VNB VPB VPWR X
-M1000 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=7.764e+11p pd=7.11e+06u as=2.9e+11p ps=2.58e+06u
-M1001 a_280_21# S VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1002 a_606_369# A0 a_79_21# VPB phighvt w=640000u l=180000u
-+  ad=1.472e+11p pd=1.74e+06u as=1.92e+11p ps=1.88e+06u
-M1003 VPWR S a_606_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_79_21# A0 a_310_47# VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=1.386e+11p ps=1.5e+06u
-M1005 VGND S a_502_47# VNB nshort w=420000u l=150000u
-+  ad=5.551e+11p pd=5.47e+06u as=3.108e+11p ps=2.32e+06u
-M1006 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1007 a_502_47# A1 a_79_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_318_369# a_280_21# VPWR VPB phighvt w=640000u l=180000u
-+  ad=4.992e+11p pd=2.84e+06u as=0p ps=0u
-M1009 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_79_21# A1 a_318_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_310_47# a_280_21# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_280_21# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.155e+11p pd=1.39e+06u as=0p ps=0u
+X0 a_606_369# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X1 a_502_47# S VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_318_369# A1 a_79_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X3 VPWR a_79_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_79_21# A0 a_606_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X5 VPWR a_280_21# a_318_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X6 X a_79_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND S a_280_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR S a_280_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X9 X a_79_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VGND a_79_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_79_21# A1 a_502_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND a_280_21# a_310_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_310_47# A0 a_79_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_4.cdl b/cells/mux2/sky130_fd_sc_hdll__mux2_4.cdl
index 3e9e856..5b65cfc 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_4.cdl
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__mux2_4 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 xb A0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA10 xb A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X xb VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB 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
-MMPA01 sndPS A0 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
-MMPA10 VPWR Sb 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
-MMPA11 sndPSb A1 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
-MMIP1 Sb S 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
-MMIP2 X xb VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X xb VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__mux2_4
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_4.netlist.tsv b/cells/mux2/sky130_fd_sc_hdll__mux2_4.netlist.tsv
index 85b85be..9772a74 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_4.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	xb	A1	sndNA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	xb	A0	smdNA0	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	xb	A1	sndNA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_4.spice b/cells/mux2/sky130_fd_sc_hdll__mux2_4.spice
index 68a375e..fd8081e 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_4.spice
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_hdll__mux2_4 A0 A1 S VGND VNB VPB VPWR X
-M1000 VPWR a_424_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.195e+12p pd=1.039e+07u as=5.8e+11p ps=5.16e+06u
-M1001 a_424_297# A0 a_334_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.4e+11p pd=2.68e+06u as=5.4e+11p ps=5.08e+06u
-M1002 X a_424_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_424_297# VGND VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=8.3525e+11p ps=7.77e+06u
-M1004 VPWR S a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1005 VGND a_424_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_530_47# A1 a_424_297# VNB nshort w=650000u l=150000u
-+  ad=5.8175e+11p pd=3.09e+06u as=2.405e+11p ps=2.04e+06u
-M1007 VPWR a_424_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND S a_530_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_424_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND S a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1011 a_424_297# A0 a_226_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.525e+11p ps=3e+06u
-M1012 VPWR S a_334_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_424_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_222_297# A1 a_424_297# VPB phighvt w=1e+06u l=180000u
-+  ad=6e+11p pd=5.2e+06u as=0p ps=0u
-M1015 a_226_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_222_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_424_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_530_47# S VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_334_297# A0 a_424_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VGND a_424_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_27_47# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VPWR a_424_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND a_27_47# a_226_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 X a_424_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 X a_424_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_424_297# A1 a_530_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_334_297# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VGND a_424_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VPWR a_27_47# a_222_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_27_47# S VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 X a_424_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_226_47# A0 a_424_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VPWR a_424_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 X a_424_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_424_297# A1 a_222_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_8.cdl b/cells/mux2/sky130_fd_sc_hdll__mux2_8.cdl
index 98f714d..7908bbb 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_8.cdl
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_8.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__mux2_8 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA00 VPWR S VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB 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
-MMIP2 X xb VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X xb VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__mux2_8
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_8.netlist.tsv b/cells/mux2/sky130_fd_sc_hdll__mux2_8.netlist.tsv
index 4f851d7..e47ebd6 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_8.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_8.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nshort	8	0.65	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	8	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8	8	0.65	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	VPWR	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_8.spice b/cells/mux2/sky130_fd_sc_hdll__mux2_8.spice
index 6e70b84..c91d874 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_8.spice
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_8.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_hdll__mux2_8 A0 A1 S VGND VNB VPB VPWR X
-M1000 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=2.16e+12p pd=1.832e+07u as=1.16e+12p ps=1.032e+07u
-M1001 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_870_297# A0 a_79_21# VPB phighvt w=1e+06u l=180000u
-+  ad=1.385e+12p pd=6.77e+06u as=5.8e+11p ps=5.16e+06u
-M1003 a_79_21# A1 a_872_47# VNB nshort w=640000u l=150000u
-+  ad=4.096e+11p pd=3.84e+06u as=9.568e+11p ps=5.55e+06u
-M1004 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_872_47# A1 a_79_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=8.645e+11p pd=7.86e+06u as=1.5084e+12p ps=1.374e+07u
-M1007 VGND S a_872_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_1369_199# a_1422_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.0464e+12p ps=5.83e+06u
-M1012 a_79_21# A0 a_870_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_1369_199# a_1420_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.675e+12p ps=7.35e+06u
-M1014 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1420_297# a_1369_199# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1420_297# A1 a_79_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_79_21# A0 a_1422_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1369_199# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1020 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_870_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_872_47# S VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_79_21# A1 a_1420_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1422_47# a_1369_199# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1422_47# A0 a_79_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1369_199# S VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
-M1033 VPWR S a_870_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_79_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 X a_79_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_870_297# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_1420_297# a_1369_199# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VPWR S a_1369_199# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND S a_872_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 VGND a_1369_199# a_1422_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_79_21# A0 a_1422_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 VGND a_79_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VPWR a_79_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 X a_79_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VPWR S a_870_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_872_47# A1 a_79_21# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 VGND a_79_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 X a_79_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_1422_47# a_1369_199# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 VPWR a_79_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_79_21# A0 a_870_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 a_79_21# A1 a_1420_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 VGND a_79_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_870_297# A0 a_79_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 a_1420_297# A1 a_79_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 X a_79_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VPWR a_79_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 X a_79_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_79_21# A1 a_872_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X26 a_872_47# S VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X27 X a_79_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 VGND a_79_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 VGND S a_1369_199# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 a_1422_47# A0 a_79_21# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X31 VPWR a_1369_199# a_1420_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 X a_79_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 X a_79_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.cdl b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.cdl
index b8e6b7f..3df3b3c 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.cdl
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__mux2i_1 A0 A1 S VGND VNB VPB VPWR Y
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNA00 Y A0 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Y A0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA10 Y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 Y A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB 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
-MMPA01 sndPS A0 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
-MMPA10 VPWR Sb 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
-MMPA11 sndPSb A1 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
-MMIP1 Sb S VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__mux2i_1
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.netlist.tsv b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.netlist.tsv
index 6a762d9..e466ff5 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.netlist.tsv
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	Y	A1	sndNA1	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Y	A0	smdNA0	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	Y	A1	sndNA1	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.spice b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.spice
index b333932..6744fe0 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.spice
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__mux2i_1 A0 A1 S VGND VNB VPB VPWR Y
-M1000 Y A0 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=5.6e+11p ps=5.12e+06u
-M1001 a_27_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.2e+11p ps=5.64e+06u
-M1002 a_207_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=3.575e+11p pd=3.7e+06u as=1.755e+11p ps=1.84e+06u
-M1003 VGND S a_303_205# VNB nshort w=650000u l=150000u
-+  ad=3.445e+11p pd=3.66e+06u as=2.275e+11p ps=2e+06u
-M1004 VPWR S a_303_205# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3e+11p ps=2.6e+06u
-M1005 Y A0 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.835e+11p ps=3.78e+06u
-M1006 VPWR a_303_205# a_215_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=4.5e+11p ps=2.9e+06u
-M1007 a_215_297# A1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_303_205# a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_207_47# S VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_303_205# S VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_27_47# A0 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_303_205# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 Y A1 a_207_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND S a_207_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_27_297# A0 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_27_47# a_303_205# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VPWR S a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_215_297# a_303_205# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Y A1 a_215_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.cdl b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.cdl
index 7324e10..e1bc188 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.cdl
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__mux2i_2 A0 A1 S VGND VNB VPB VPWR Y
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNA00 Y A0 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Y A0 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA10 Y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 Y A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA11 sndNA1 S VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA00 VPWR S VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__mux2i_2
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.netlist.tsv b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.netlist.tsv
index f21df98..f7087d9 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.netlist.tsv
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	Y	A1	sndNA1	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.65	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Y	A0	smdNA0	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	Y	A1	sndNA1	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.65	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.spice b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.spice
index f75a573..fa522d8 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.spice
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_hdll__mux2i_2 A0 A1 S VGND VNB VPB VPWR Y
-M1000 Y A0 a_401_47# VNB nshort w=650000u l=150000u
-+  ad=7.3125e+11p pd=6.15e+06u as=4.16e+11p ps=3.88e+06u
-M1001 a_211_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=8.5e+11p ps=7.7e+06u
-M1002 a_213_47# S VGND VNB nshort w=650000u l=150000u
-+  ad=4.1925e+11p pd=3.89e+06u as=5.85e+11p ps=5.7e+06u
-M1003 a_401_47# A0 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_211_297# A0 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.065e+12p ps=8.13e+06u
-M1005 VPWR S a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1006 VPWR a_27_47# a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.85e+11p ps=5.17e+06u
-M1007 a_213_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_27_47# a_401_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_399_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A1 a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND S a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1012 a_401_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_399_297# A1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR S a_211_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A0 a_211_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND S a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A1 a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_399_297# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_211_297# A0 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_213_47# S VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 Y A1 a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 Y A0 a_401_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_401_47# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_213_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_27_47# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_399_297# A1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR a_27_47# a_399_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 Y A0 a_211_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VGND S a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_211_297# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VGND a_27_47# a_401_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_27_47# S VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 Y A1 a_399_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VPWR S a_211_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_401_47# A0 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.cdl b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.cdl
index 7e3dd93..a327023 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.cdl
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__mux2i_4 A0 A1 S VGND VNB VPB VPWR Y
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNA00 Y A0 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Y A0 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA10 Y A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 Y A1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA11 sndNA1 S VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA00 VPWR S VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__mux2i_4
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.netlist.tsv b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.netlist.tsv
index e2de928..1a71abe 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.netlist.tsv
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	Y	A1	sndNA1	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Y	A0	smdNA0	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	Y	A1	sndNA1	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.spice b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.spice
index c65c7b9..a02da81 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.spice
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_hdll__mux2i_4 A0 A1 S VGND VNB VPB VPWR Y
-M1000 Y A1 a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.41e+12p pd=1.282e+07u as=1.215e+12p ps=1.043e+07u
-M1001 VGND a_1311_21# a_109_47# VNB nshort w=650000u l=150000u
-+  ad=1.03025e+12p pd=9.67e+06u as=9.3275e+11p ps=8.07e+06u
-M1002 Y A0 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1003 VPWR a_1311_21# a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.475e+12p pd=1.295e+07u as=0p ps=0u
-M1004 a_109_47# a_1311_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_117_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND S a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=8.645e+11p ps=7.86e+06u
-M1007 a_493_297# A1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_485_47# S VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR S a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_109_47# A0 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=9.295e+11p ps=9.36e+06u
-M1011 Y A1 a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A0 a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A1 a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_493_297# a_1311_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_117_297# A0 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND S a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_493_297# A1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_1311_21# a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_485_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_117_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_109_47# a_1311_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A0 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_493_297# a_1311_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_485_47# S VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A0 a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A1 a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_485_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND a_1311_21# a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1311_21# S VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1030 a_117_297# A0 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR S a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_109_47# A0 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1311_21# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
+X0 Y A1 a_493_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_485_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VPWR a_1311_21# a_493_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_109_47# a_1311_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_493_297# a_1311_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_485_47# S VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y A0 a_109_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y A0 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_493_297# A1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_117_297# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_485_47# S VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 Y A1 a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_117_297# A0 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 Y A0 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 Y A1 a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VPWR a_1311_21# a_493_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_109_47# A0 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_493_297# a_1311_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 a_117_297# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_109_47# A0 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 Y A1 a_493_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR S a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 VGND S a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 a_109_47# a_1311_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 VGND a_1311_21# a_109_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_117_297# A0 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 Y A0 a_109_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 VGND S a_1311_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X28 VPWR S a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 VPWR S a_1311_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 VGND S a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 VGND a_1311_21# a_109_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X32 a_493_297# A1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 a_485_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/muxb/sky130_fd_sc_hdll__muxb.spice b/cells/muxb/sky130_fd_sc_hdll__muxb.spice
index 5011418..8302b04 100644
--- a/cells/muxb/sky130_fd_sc_hdll__muxb.spice
+++ b/cells/muxb/sky130_fd_sc_hdll__muxb.spice
@@ -16,2234 +16,1179 @@
 
 
 .subckt sky130_fd_sc_hdll__clkmux2_2 VGND VPWR S A1 A0 X VPB VNB
-M1000 VPWR a_79_199# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.0664e+12p pd=8.08e+06u as=2.9e+11p ps=2.58e+06u
-M1001 VGND a_741_21# a_570_47# VNB nshort w=420000u l=150000u
-+  ad=6.32e+11p pd=5.72e+06u as=3.591e+11p ps=2.55e+06u
-M1002 a_335_309# S VPWR VPB phighvt w=940000u l=180000u
-+  ad=3.901e+11p pd=2.71e+06u as=0p ps=0u
-M1003 X a_79_199# VGND VNB nshort w=520000u l=150000u
-+  ad=1.404e+11p pd=1.58e+06u as=0p ps=0u
-M1004 a_741_21# S VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1005 X a_79_199# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_691_309# A1 a_79_199# VPB phighvt w=940000u l=180000u
-+  ad=2.444e+11p pd=2.4e+06u as=9.447e+11p ps=3.89e+06u
-M1007 a_570_47# A0 a_79_199# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.121e+11p ps=1.85e+06u
-M1008 a_337_47# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1009 a_741_21# S VPWR VPB phighvt w=940000u l=180000u
-+  ad=2.726e+11p pd=2.46e+06u as=0p ps=0u
-M1010 VGND a_79_199# X VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_79_199# A0 a_335_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_741_21# a_691_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_79_199# A1 a_337_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND S a_337_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_79_199# VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X2 a_337_47# A1 a_79_199# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_79_199# A1 a_691_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X4 VGND a_79_199# X VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X5 VPWR a_79_199# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_691_309# a_741_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X7 VPWR S a_335_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X8 VPWR S a_741_21# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X9 a_79_199# A0 a_570_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_335_309# A0 a_79_199# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X11 a_570_47# a_741_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 X a_79_199# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VGND S a_741_21# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
 .ends
 .subckt sky130_fd_sc_hdll__muxb4to1_4 VPB VNB VGND VPWR Z S[0] S[1] D[1] D[2] S[2]
 + S[3] D[3] D[0]
-M1000 Z a_1430_325# a_1643_311# VPB phighvt w=820000u l=180000u
-+  ad=1.9024e+12p pd=1.776e+07u as=1.2606e+12p ps=1.174e+07u
-M1001 a_1643_311# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.0912e+12p ps=4.808e+07u
-M1002 a_2695_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=3.3176e+12p ps=3.4e+07u
-M1003 VPWR D[0] a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1004 VPWR S[0] a_559_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1005 a_2693_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1006 VPWR D[1] a_1643_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Z S[1] a_1693_66# VNB nshort w=520000u l=150000u
-+  ad=1.1232e+12p pd=1.264e+07u as=7.618e+11p ps=8.38e+06u
-M1008 Z S[2] a_2695_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_2695_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR D[3] a_4219_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1011 Z S[3] a_4269_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1012 a_4269_66# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND D[3] a_4269_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1643_311# a_1430_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_119_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1016 a_1693_66# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND D[1] a_1693_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_559_265# S[0] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR D[2] a_2693_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_3135_265# S[2] VPWR VPB phighvt w=820000u l=180000u
-+  ad=2.378e+11p pd=2.22e+06u as=0p ps=0u
-M1021 VGND D[2] a_2695_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Z S[3] a_4269_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Z S[0] a_119_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND D[0] a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_2693_297# a_3135_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Z S[1] a_1693_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_4219_311# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_119_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1693_66# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_2695_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_4269_66# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_4269_66# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1693_66# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_2695_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR D[3] a_4219_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR S[1] a_1430_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1037 Z S[0] a_119_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1643_311# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_4219_311# a_4006_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_4269_66# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_117_297# a_559_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 Z a_1430_325# a_1643_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 Z a_3135_265# a_2693_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_4006_325# S[3] VPWR VPB phighvt w=820000u l=180000u
-+  ad=2.378e+11p pd=2.22e+06u as=0p ps=0u
-M1046 a_559_265# S[0] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1047 a_2693_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 Z a_4006_325# a_4219_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VGND D[1] a_1693_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 a_1430_325# S[1] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 a_2693_297# a_3135_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VGND D[2] a_2695_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 VGND S[0] a_559_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 VGND D[3] a_4269_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 VPWR D[0] a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 Z a_559_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 a_119_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 VGND S[2] a_3135_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1059 VGND S[3] a_4006_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1060 a_4219_311# a_4006_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1061 VGND S[1] a_1430_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1062 a_3135_265# S[2] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 a_117_297# a_559_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 Z a_3135_265# a_2693_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 VPWR D[1] a_1643_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 a_1643_311# a_1430_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1067 VPWR S[3] a_4006_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1068 Z a_4006_325# a_4219_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 a_1430_325# S[1] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 a_4219_311# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1071 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1072 Z a_559_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1073 VGND D[0] a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1074 VPWR D[2] a_2693_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1075 a_4006_325# S[3] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1076 VPWR S[2] a_3135_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 Z S[2] a_2695_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1078 a_119_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1079 a_1693_66# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND D[0] a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_119_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X2 VGND D[2] a_2695_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_2695_47# D[2] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_1643_311# a_1430_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X5 VPWR D[2] a_2693_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_559_265# S[0] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_3135_265# S[2] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 Z S[0] a_119_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X9 Z a_3135_265# a_2693_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X10 a_4219_311# a_4006_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X11 a_1693_66# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VGND D[2] a_2695_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_4269_66# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_1643_311# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_3135_265# S[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X16 VGND S[3] a_4006_325# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 Z S[3] a_4269_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X18 a_1430_325# S[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X19 Z S[3] a_4269_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X20 VPWR D[0] a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR S[2] a_3135_265# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X22 VGND S[0] a_559_265# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VGND D[1] a_1693_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 a_1693_66# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_4006_325# S[3] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VGND D[3] a_4269_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 Z a_559_265# a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X28 a_117_297# D[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 a_559_265# S[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X30 Z a_4006_325# a_4219_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X31 a_1693_66# S[1] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X32 VPWR D[3] a_4219_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 a_4269_66# S[3] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X34 VPWR S[3] a_4006_325# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X35 VGND D[1] a_1693_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X36 VPWR D[0] a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X37 Z a_1430_325# a_1643_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X38 Z S[2] a_2695_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X39 a_4219_311# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X40 a_2693_297# D[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X41 VGND S[1] a_1430_325# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X42 a_1643_311# a_1430_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X43 a_2693_297# a_3135_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X44 Z S[2] a_2695_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X45 VGND S[2] a_3135_265# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X46 a_119_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X47 VPWR D[1] a_1643_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X48 a_4269_66# S[3] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X49 a_119_47# D[0] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X50 VPWR D[2] a_2693_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X51 a_2695_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X52 VPWR S[1] a_1430_325# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X53 VGND D[0] a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X54 a_2695_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X55 Z S[0] a_119_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X56 VGND D[3] a_4269_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X57 a_117_297# a_559_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X58 a_119_47# D[0] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X59 Z S[1] a_1693_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X60 VPWR S[0] a_559_265# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X61 Z a_1430_325# a_1643_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X62 a_4219_311# a_4006_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X63 Z S[1] a_1693_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X64 a_117_297# D[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X65 a_2693_297# D[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X66 Z a_4006_325# a_4219_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X67 VPWR D[3] a_4219_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X68 a_4269_66# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X69 a_1430_325# S[1] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X70 a_4219_311# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X71 Z a_3135_265# a_2693_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X72 a_1693_66# S[1] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X73 Z a_559_265# a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X74 a_1643_311# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X75 a_4006_325# S[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X76 a_2695_47# D[2] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X77 a_2693_297# a_3135_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X78 a_117_297# a_559_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X79 VPWR D[1] a_1643_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
 .subckt sky130_fd_sc_hdll__muxb16to1_1 Z VGND VPWR VNB VPB D[0] S[12] S[13] S[8] S[9]
 + S[10] S[11] S[14] S[15] D[12] D[9] D[10] D[13] D[14] D[15] D[8] D[11] S[0] S[1]
 + D[1] D[2] S[2] S[3] D[4] S[4] S[5] D[5] D[6] S[6] S[7] D[7] D[3]
-M1000 Z a_1012_793# a_945_591# VPB phighvt w=820000u l=180000u
-+  ad=3.5424e+12p pd=3.488e+07u as=3.297e+11p ps=2.69e+06u
-M1001 a_1765_47# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=3.7518e+12p ps=3.424e+07u
-M1002 a_937_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1003 a_2593_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1004 Z a_2668_793# a_2601_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=3.297e+11p ps=2.69e+06u
-M1005 a_1773_297# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=6.38e+12p ps=4.876e+07u
-M1006 a_1773_591# D[12] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1007 VGND S[6] a_2668_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1008 a_2390_591# a_2189_937# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1009 a_1361_47# S[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1010 VPWR D[7] a_3218_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.297e+11p ps=2.69e+06u
-M1011 a_937_911# D[10] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1012 a_1361_937# S[11] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1013 VPWR D[15] a_3218_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.297e+11p ps=2.69e+06u
-M1014 Z a_1840_265# a_1773_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1574_47# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=2.1632e+12p ps=2.496e+07u
-M1016 a_2402_937# S[13] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1017 a_734_333# a_533_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1018 Z S[2] a_937_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_3017_47# S[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1020 a_2402_47# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1021 a_3017_937# S[15] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1022 a_1562_333# a_1361_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1023 a_746_47# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1024 VGND S[12] a_1840_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1025 a_109_911# D[8] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1026 VGND S[14] a_2668_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1027 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1028 VPWR D[3] a_1562_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_2601_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1030 Z S[4] a_1765_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_533_937# S[9] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1032 a_117_591# D[8] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1033 VPWR D[11] a_1562_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.297e+11p ps=2.69e+06u
-M1034 VGND D[15] a_3230_937# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.95e+06u
-M1035 a_2601_591# D[14] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Z a_184_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1765_911# D[12] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1038 a_3218_591# a_3017_937# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_533_47# S[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1040 a_945_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1041 Z a_1012_265# a_945_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_533_937# S[9] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1043 VGND D[11] a_1574_937# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.95e+06u
-M1044 a_945_591# D[10] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VPWR S[0] a_184_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1046 a_2189_47# S[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1047 a_746_937# S[9] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1048 VPWR S[8] a_184_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1049 a_2189_937# S[13] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1050 VPWR S[2] a_1012_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1051 Z a_2668_265# a_2601_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 a_1361_47# S[3] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1053 VPWR S[10] a_1012_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1054 a_3230_937# S[15] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 a_533_47# S[1] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1056 Z S[8] a_109_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 VGND D[9] a_746_937# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 VGND S[0] a_184_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1059 a_2390_333# a_2189_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1060 a_3230_47# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1061 a_1361_937# S[11] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1062 VGND D[1] a_746_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 Z S[6] a_2593_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 Z a_1840_793# a_1773_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 Z S[10] a_937_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 VPWR S[6] a_2668_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1067 VGND S[8] a_184_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1068 a_1574_937# S[11] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 Z S[12] a_1765_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 a_2189_937# S[13] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1071 a_734_591# a_533_937# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1072 VPWR S[14] a_2668_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1073 a_3017_937# S[15] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1074 a_1562_591# a_1361_937# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1075 VPWR D[1] a_734_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1076 VPWR D[9] a_734_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 VPWR D[5] a_2390_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1078 a_2189_47# S[5] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1079 VPWR D[13] a_2390_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1080 VPWR S[4] a_1840_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1081 VGND D[3] a_1574_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1082 VGND S[10] a_1012_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1083 a_2593_911# D[14] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1084 Z S[14] a_2593_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1085 VPWR S[12] a_1840_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1086 a_109_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1087 VGND D[5] a_2402_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1088 VGND S[2] a_1012_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1089 VGND D[7] a_3230_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1090 Z a_184_793# a_117_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1091 VGND D[13] a_2402_937# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1092 Z S[0] a_109_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1093 a_3218_333# a_3017_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1094 VGND S[4] a_1840_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1095 a_3017_47# S[7] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
+X0 VGND S[11] a_1361_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X1 VPWR D[8] a_117_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VPWR S[1] a_533_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_109_911# S[8] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X4 VGND D[2] a_937_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_1840_265# S[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_1012_265# S[2] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X7 VGND D[4] a_1765_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_3218_333# D[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND D[10] a_937_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_2402_47# D[5] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VGND S[7] a_3017_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X12 VPWR S[13] a_2189_937# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VPWR D[4] a_1773_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 VPWR D[10] a_945_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VPWR S[15] a_3017_937# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 Z S[7] a_3230_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X17 a_937_911# S[10] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X18 a_2390_333# D[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_1574_47# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_1765_47# S[4] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X21 a_1012_265# S[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 a_1765_911# S[12] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X23 VPWR S[11] a_1361_937# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 VPWR D[0] a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 a_109_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X26 VGND S[13] a_2189_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X27 Z a_3017_937# a_3218_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X28 a_2593_47# S[6] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X29 VGND S[9] a_533_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X30 a_117_591# a_184_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X31 Z a_533_937# a_734_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X32 VGND S[15] a_3017_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X33 a_1562_591# D[11] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X34 VPWR D[2] a_945_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 VPWR S[5] a_2189_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X36 a_2668_265# S[6] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X37 Z S[13] a_2402_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X38 VPWR S[7] a_3017_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X39 VGND D[8] a_109_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X40 a_3230_937# D[15] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X41 Z a_2189_937# a_2390_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X42 a_2601_591# a_2668_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X43 VPWR S[3] a_1361_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X44 Z a_3017_47# a_3218_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X45 Z S[11] a_1574_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X46 a_117_297# a_184_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X47 Z a_533_47# a_734_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X48 a_184_265# S[0] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X49 VGND S[3] a_1361_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X50 a_1840_793# S[12] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X51 VGND D[14] a_2593_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X52 a_2593_911# S[14] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X53 VGND S[1] a_533_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X54 a_184_793# S[8] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X55 a_2402_937# D[13] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X56 a_2668_793# S[14] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X57 a_734_591# D[9] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X58 a_945_591# a_1012_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X59 a_2668_793# S[14] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X60 Z a_1361_937# a_1562_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X61 a_1562_333# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X62 a_1773_591# a_1840_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X63 Z a_2189_47# a_2390_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X64 VGND S[5] a_2189_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X65 a_746_937# D[9] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X66 a_2601_297# a_2668_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X67 a_1012_793# S[10] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X68 a_184_793# S[8] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X69 VGND D[12] a_1765_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X70 Z S[15] a_3230_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X71 Z S[5] a_2402_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X72 a_1574_937# D[11] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X73 VPWR D[14] a_2601_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X74 a_945_297# a_1012_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X75 VGND D[0] a_109_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X76 Z a_1361_47# a_1562_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X77 a_937_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X78 VPWR S[9] a_533_937# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X79 a_3218_591# D[15] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X80 a_1773_297# a_1840_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X81 Z S[3] a_1574_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X82 a_2668_265# S[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X83 a_1840_793# S[12] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X84 Z S[1] a_746_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X85 VPWR D[12] a_1773_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X86 a_734_333# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X87 Z S[9] a_746_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X88 a_2390_591# D[13] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X89 VGND D[6] a_2593_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X90 a_1012_793# S[10] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X91 a_184_265# S[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X92 a_746_47# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X93 a_1840_265# S[4] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X94 a_3230_47# D[7] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X95 VPWR D[6] a_2601_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
 .subckt sky130_fd_sc_hdll__muxb4to1_2 VGND VPWR Z VNB VPB S[1] S[2] S[3] D[1] D[0]
 + D[2] D[3] S[0]
-M1000 VPWR D[2] a_1315_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.88e+12p pd=1.576e+07u as=8.211e+11p ps=7.41e+06u
-M1001 VPWR D[3] a_2112_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1002 a_27_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1003 Z a_1566_265# a_1315_297# VPB phighvt w=820000u l=180000u
-+  ad=9.512e+11p pd=8.88e+06u as=0p ps=0u
-M1004 Z a_1989_47# a_2112_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_297# a_278_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR S[0] a_278_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1007 a_1989_47# S[3] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=9.828e+11p ps=1.052e+07u
-M1008 a_2133_69# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1009 Z a_278_265# a_27_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_845_69# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=5.616e+11p ps=6.32e+06u
-M1011 a_27_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1012 Z S[1] a_845_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Z S[0] a_27_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_824_333# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1016 a_1989_47# S[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1017 VPWR D[0] a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_701_47# S[1] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1019 VGND D[1] a_845_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_824_333# a_701_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND S[0] a_278_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1022 a_701_47# S[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1023 VPWR D[1] a_824_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_845_69# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Z S[3] a_2133_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND D[0] a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Z a_701_47# a_824_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1315_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1029 Z S[2] a_1315_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1315_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1315_297# a_1566_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_2112_333# a_1989_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND D[2] a_1315_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_2133_69# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR S[2] a_1566_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1036 a_2112_333# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1315_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND S[2] a_1566_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1039 VGND D[3] a_2133_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1315_47# D[2] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_2112_333# a_1989_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X2 Z a_278_265# a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X3 Z S[0] a_27_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X4 a_845_69# S[1] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X5 VPWR D[3] a_2112_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_27_297# D[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND D[1] a_845_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VGND D[3] a_2133_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_1566_265# S[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 Z a_701_47# a_824_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X11 a_845_69# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_2133_69# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VPWR S[1] a_701_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_824_333# a_701_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X15 a_27_297# a_278_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X16 Z S[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X17 a_27_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X18 VGND S[1] a_701_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X19 a_278_265# S[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 a_2112_333# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR D[1] a_824_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 VPWR D[2] a_1315_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 VGND D[0] a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 a_27_47# D[0] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_1315_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X26 Z S[3] a_2133_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X27 a_824_333# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 a_1315_297# D[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 VGND D[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 a_2133_69# S[3] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X31 VPWR D[0] a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 Z S[1] a_845_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X33 VGND S[3] a_1989_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X34 a_278_265# S[0] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X35 Z a_1566_265# a_1315_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X36 VPWR S[3] a_1989_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X37 a_1315_297# a_1566_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X38 a_1566_265# S[2] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X39 Z a_1989_47# a_2112_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
 .ends
 .subckt sky130_fd_sc_hdll__muxb8to1_1 VGND Z VPWR VNB VPB D[0] S[0] S[1] D[1] D[2]
 + S[2] S[3] D[4] S[4] S[5] D[5] D[6] S[6] S[7] D[7] D[3]
-M1000 a_1765_47# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=1.8759e+12p ps=1.712e+07u
-M1001 a_937_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1002 a_2593_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1003 a_1773_297# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=3.19e+12p ps=2.438e+07u
-M1004 VGND S[6] a_2668_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1005 a_1361_47# S[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1006 VPWR D[7] a_3218_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.297e+11p ps=2.69e+06u
-M1007 Z a_1840_265# a_1773_297# VPB phighvt w=820000u l=180000u
-+  ad=1.7712e+12p pd=1.744e+07u as=0p ps=0u
-M1008 a_1574_47# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=1.0816e+12p ps=1.248e+07u
-M1009 a_734_333# a_533_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1010 Z S[2] a_937_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_3017_47# S[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1012 a_2402_47# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1013 a_1562_333# a_1361_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1014 a_746_47# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1015 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1016 VPWR D[3] a_1562_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_2601_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1018 Z S[4] a_1765_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Z a_184_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_533_47# S[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1021 a_945_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1022 Z a_1012_265# a_945_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR S[0] a_184_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1024 a_2189_47# S[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1025 VPWR S[2] a_1012_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1026 Z a_2668_265# a_2601_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1361_47# S[3] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1028 a_533_47# S[1] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1029 VGND S[0] a_184_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1030 a_2390_333# a_2189_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1031 a_3230_47# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1032 VGND D[1] a_746_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Z S[6] a_2593_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR S[6] a_2668_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1035 VPWR D[1] a_734_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR D[5] a_2390_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_2189_47# S[5] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1038 VPWR S[4] a_1840_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1039 VGND D[3] a_1574_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_109_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1041 VGND D[5] a_2402_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VGND S[2] a_1012_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1043 VGND D[7] a_3230_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 Z S[0] a_109_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_3218_333# a_3017_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VGND S[4] a_1840_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1047 a_3017_47# S[7] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
+X0 VPWR S[1] a_533_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND D[2] a_937_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_1840_265# S[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_1012_265# S[2] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X4 VGND D[4] a_1765_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_3218_333# D[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_2402_47# D[5] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND S[7] a_3017_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X8 VPWR D[4] a_1773_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Z S[7] a_3230_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X10 a_2390_333# D[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_1574_47# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_1765_47# S[4] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X13 a_1012_265# S[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 VPWR D[0] a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_109_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X16 a_2593_47# S[6] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X17 VPWR D[2] a_945_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VPWR S[5] a_2189_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_2668_265# S[6] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X20 VPWR S[7] a_3017_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR S[3] a_1361_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 Z a_3017_47# a_3218_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X23 a_117_297# a_184_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X24 Z a_533_47# a_734_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X25 a_184_265# S[0] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X26 VGND S[3] a_1361_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X27 VGND S[1] a_533_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X28 a_1562_333# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 Z a_2189_47# a_2390_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X30 VGND S[5] a_2189_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X31 a_2601_297# a_2668_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X32 Z S[5] a_2402_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X33 a_945_297# a_1012_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X34 VGND D[0] a_109_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X35 Z a_1361_47# a_1562_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X36 a_937_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X37 a_1773_297# a_1840_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X38 Z S[3] a_1574_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X39 a_2668_265# S[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X40 Z S[1] a_746_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X41 a_734_333# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X42 VGND D[6] a_2593_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X43 a_184_265# S[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X44 a_746_47# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X45 a_1840_265# S[4] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X46 a_3230_47# D[7] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X47 VPWR D[6] a_2601_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
 .subckt sky130_fd_sc_hdll__muxb16to1_4 VGND Z VPWR VNB VPB S[6] S[10] D[12] D[13]
 + D[8] D[15] D[10] D[9] D[14] S[14] D[11] S[11] S[8] S[15] S[12] S[9] S[13] D[3] D[0]
 + D[4] D[5] D[2] D[1] D[6] S[2] S[3] S[7] S[0] S[1] S[4] S[5] D[7]
-M1000 a_2693_591# a_3135_793# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=7.6096e+12p ps=7.104e+07u
-M1001 a_2695_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=1.32704e+13p ps=1.36e+08u
-M1002 a_1643_311# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=2.03648e+13p ps=1.9232e+08u
-M1003 a_9513_66# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=4.4928e+12p ps=5.056e+07u
-M1004 a_7939_911# D[14] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1005 a_7939_911# S[14] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_5361_591# D[12] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1007 Z a_1430_325# a_1643_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1430_599# S[9] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1009 a_8379_265# S[6] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1010 a_2695_911# S[10] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1011 a_1643_613# D[9] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1012 VGND D[12] a_5363_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1013 Z a_9250_325# a_9463_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1014 VPWR D[0] a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1015 VPWR S[6] a_8379_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1016 VPWR S[4] a_5803_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1017 a_559_793# S[8] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1018 VPWR S[0] a_559_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1019 VGND D[9] a_1693_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1020 a_2693_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1021 VGND D[4] a_5363_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1022 a_6674_325# S[5] VPWR VPB phighvt w=820000u l=180000u
-+  ad=2.378e+11p pd=2.22e+06u as=0p ps=0u
-M1023 VPWR D[8] a_117_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1024 a_2693_591# D[10] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_7937_591# a_8379_793# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1026 Z a_559_793# a_117_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Z S[9] a_1693_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_8379_793# S[14] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1029 VGND D[5] a_6937_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1030 a_4269_66# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1031 Z S[3] a_4269_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1693_918# S[9] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND D[10] a_2695_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR S[13] a_6674_599# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1035 Z S[2] a_2695_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_2695_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND S[4] a_5803_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1038 VPWR D[1] a_1643_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 Z S[1] a_1693_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1040 VPWR D[7] a_9463_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VGND D[3] a_4269_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR D[3] a_4219_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1043 a_3135_793# S[10] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1044 a_5363_911# S[12] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_1693_66# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 Z a_6674_325# a_6887_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1047 a_4269_918# S[11] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1048 a_1643_311# a_1430_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VGND D[1] a_1693_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 a_5361_297# a_5803_265# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1051 VPWR D[9] a_1643_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VPWR D[11] a_4219_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1053 a_119_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1054 VGND S[11] a_4006_599# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1055 Z a_5803_793# a_5361_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 VPWR D[15] a_9463_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1057 a_6937_66# D[5] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 a_9463_311# a_9250_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 Z S[3] a_4269_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 VGND S[13] a_6674_599# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1061 a_559_265# S[0] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 VGND D[2] a_2695_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 a_8379_265# S[6] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 Z S[14] a_7939_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 a_3135_265# S[2] VPWR VPB phighvt w=820000u l=180000u
-+  ad=2.378e+11p pd=2.22e+06u as=0p ps=0u
-M1066 VPWR S[11] a_4006_599# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1067 VPWR D[2] a_2693_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1068 VGND D[7] a_9513_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 a_7939_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1070 Z S[8] a_119_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1071 a_4219_613# a_4006_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1072 a_4006_599# S[11] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1073 a_9513_918# D[15] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1074 Z S[0] a_119_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1075 VGND S[6] a_8379_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1076 VPWR D[10] a_2693_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 Z a_8379_793# a_7937_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1078 VGND S[8] a_559_793# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1079 a_117_591# a_559_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1080 Z a_3135_793# a_2693_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1081 a_7937_297# a_8379_265# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1082 a_2693_297# a_3135_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1083 VPWR S[10] a_3135_793# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1084 VGND D[0] a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1085 VGND D[8] a_119_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1086 a_5803_265# S[4] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1087 a_9463_311# D[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1088 VPWR D[5] a_6887_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1089 a_4219_311# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1090 a_119_911# D[8] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1091 a_5363_911# S[12] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1092 Z a_6674_599# a_6887_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1093 Z S[1] a_1693_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1094 a_6887_311# a_6674_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1095 a_5803_265# S[4] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1096 a_1693_918# S[9] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1097 VGND S[14] a_8379_793# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1098 a_1693_66# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1099 VPWR D[6] a_7937_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1100 a_4269_66# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1101 a_4219_613# D[11] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1102 VPWR D[13] a_6887_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1103 a_9463_613# D[15] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1104 Z S[15] a_9513_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1105 a_119_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1106 a_4269_66# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1107 VGND S[9] a_1430_599# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1108 a_2695_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1109 VPWR D[14] a_7937_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1110 a_2695_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1111 a_1693_918# D[9] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1112 a_1643_613# a_1430_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1113 a_1693_66# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1114 Z a_4006_599# a_4219_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1115 a_9513_66# D[7] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1116 VPWR D[3] a_4219_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1117 a_6887_613# a_6674_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1118 a_5361_297# a_5803_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1119 Z a_5803_793# a_5361_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1120 VPWR S[12] a_5803_793# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1121 a_4219_311# a_4006_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1122 VGND D[6] a_7939_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1123 VPWR S[8] a_559_793# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1124 VPWR S[14] a_8379_793# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1125 Z S[0] a_119_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1126 VGND S[5] a_6674_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1127 Z a_559_793# a_117_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1128 a_5363_911# D[12] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1129 VPWR D[11] a_4219_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1130 a_6674_599# S[13] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1131 a_9463_311# D[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1132 VGND D[13] a_6937_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1133 VPWR S[1] a_1430_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1134 a_1643_311# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1135 a_4269_66# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1136 a_6937_918# D[13] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1137 a_117_297# a_559_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1138 Z a_3135_265# a_2693_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1139 a_559_265# S[0] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1140 Z a_1430_325# a_1643_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1141 a_9250_325# S[7] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1142 VPWR S[7] a_9250_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1143 a_2695_911# D[10] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1144 VGND D[15] a_9513_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1145 a_9463_613# D[15] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1146 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1147 a_7939_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1148 a_1643_613# D[9] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1149 a_6937_918# S[13] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1150 a_4006_325# S[3] VPWR VPB phighvt w=820000u l=180000u
-+  ad=2.378e+11p pd=2.22e+06u as=0p ps=0u
-M1151 VPWR D[7] a_9463_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1152 a_6674_325# S[5] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1153 Z a_9250_325# a_9463_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1154 Z S[4] a_5363_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1155 a_117_591# D[8] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1156 VPWR D[15] a_9463_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1157 a_2693_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1158 VPWR D[4] a_5361_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1159 a_119_911# S[8] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1160 Z S[11] a_4269_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1161 Z a_1430_599# a_1643_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1162 Z S[14] a_7939_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1163 a_9463_311# a_9250_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1164 a_2693_591# D[10] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1165 VPWR D[12] a_5361_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1166 Z a_9250_599# a_9463_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1167 VGND D[1] a_1693_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1168 Z a_8379_265# a_7937_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1169 a_9513_918# S[15] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1170 a_8379_793# S[14] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1171 Z a_4006_325# a_4219_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1172 a_559_793# S[8] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1173 a_3135_793# S[10] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1174 a_9250_599# S[15] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1175 a_6937_66# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1176 VPWR D[6] a_7937_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1177 a_5363_47# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1178 VGND D[9] a_1693_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1179 VGND D[14] a_7939_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1180 a_1430_325# S[1] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1181 a_2693_297# a_3135_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1182 VGND D[2] a_2695_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1183 a_6887_311# D[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1184 VPWR D[14] a_7937_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1185 a_9250_325# S[7] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1186 a_6887_613# D[13] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1187 VGND D[12] a_5363_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1188 a_5803_793# S[12] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1189 VGND D[14] a_7939_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1190 a_9513_918# D[15] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1191 Z S[4] a_5363_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1192 VGND S[0] a_559_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1193 VGND D[3] a_4269_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1194 a_5361_297# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1195 VGND D[10] a_2695_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1196 Z a_6674_599# a_6887_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1197 Z S[15] a_9513_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1198 VGND S[7] a_9250_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1199 a_1643_613# a_1430_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1200 a_5361_591# a_5803_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1201 a_5803_793# S[12] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1202 a_7939_47# S[6] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1203 a_5361_591# D[12] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1204 a_9463_613# a_9250_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1205 a_5363_47# S[4] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1206 a_7937_297# a_8379_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1207 Z a_559_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1208 VPWR D[0] a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1209 Z S[7] a_9513_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1210 a_6937_66# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1211 a_6674_599# S[13] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1212 Z S[6] a_7939_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1213 a_5363_47# S[4] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1214 Z S[10] a_2695_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1215 VGND S[10] a_3135_793# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1216 a_9513_66# D[7] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1217 VPWR D[5] a_6887_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1218 Z S[12] a_5363_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1219 a_119_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1220 Z S[5] a_6937_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1221 VPWR D[8] a_117_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1222 VGND S[2] a_3135_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1223 VGND S[15] a_9250_599# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1224 VPWR D[13] a_6887_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1225 VPWR S[9] a_1430_599# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1226 a_6937_918# S[13] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1227 a_7937_591# a_8379_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1228 Z S[5] a_6937_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1229 a_2693_591# a_3135_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1230 a_7939_911# S[14] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1231 Z a_5803_265# a_5361_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1232 VGND D[4] a_5363_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1233 VPWR S[15] a_9250_599# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1234 VGND S[3] a_4006_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1235 VGND D[8] a_119_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1236 a_119_911# S[8] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1237 a_4006_599# S[11] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1238 a_6887_613# a_6674_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1239 a_3135_265# S[2] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1240 a_119_911# D[8] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1241 VGND S[1] a_1430_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1242 Z S[13] a_6937_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1243 a_4219_311# a_4006_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1244 a_7939_47# S[6] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1245 a_4269_918# D[11] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1246 a_7937_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1247 VGND D[5] a_6937_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1248 Z a_8379_265# a_7937_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1249 a_117_297# a_559_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1250 Z a_3135_265# a_2693_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1251 a_7937_591# D[14] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1252 a_9513_918# S[15] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1253 Z S[7] a_9513_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1254 Z S[6] a_7939_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1255 a_6887_311# D[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1256 VPWR S[5] a_6674_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1257 a_5361_591# a_5803_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1258 VGND D[6] a_7939_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1259 Z S[9] a_1693_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1260 a_4219_613# a_4006_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1261 Z a_6674_325# a_6887_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1262 a_6937_66# D[5] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1263 Z S[10] a_2695_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1264 a_6887_613# D[13] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1265 VPWR D[4] a_5361_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1266 a_1430_599# S[9] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1267 a_5363_911# D[12] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1268 a_2695_911# S[10] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1269 a_117_591# a_559_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1270 Z a_3135_793# a_2693_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1271 VPWR D[1] a_1643_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1272 a_9513_66# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1273 Z a_1430_599# a_1643_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1274 a_6937_918# D[13] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1275 a_5363_47# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1276 a_1693_918# D[9] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1277 VPWR D[12] a_5361_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1278 VGND D[15] a_9513_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1279 a_9250_599# S[15] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1280 VPWR S[3] a_4006_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1281 VGND D[7] a_9513_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1282 a_7937_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1283 VGND S[12] a_5803_793# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1284 a_1643_311# a_1430_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1285 VPWR D[9] a_1643_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1286 Z a_9250_599# a_9463_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1287 Z a_4006_325# a_4219_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1288 a_1430_325# S[1] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1289 a_4219_311# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1290 Z S[13] a_6937_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1291 a_4006_325# S[3] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1292 a_6887_311# a_6674_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1293 a_7937_591# D[14] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1294 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1295 Z a_5803_265# a_5361_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1296 VGND D[11] a_4269_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1297 a_4219_613# D[11] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1298 VGND D[13] a_6937_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1299 Z a_559_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1300 VGND D[0] a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1301 VPWR D[2] a_2693_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1302 Z S[8] a_119_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1303 a_9463_613# a_9250_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1304 a_117_591# D[8] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1305 a_7939_911# D[14] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1306 Z S[2] a_2695_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1307 a_2695_911# D[10] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1308 VPWR S[2] a_3135_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1309 VPWR D[10] a_2693_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1310 VGND D[11] a_4269_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1311 a_4269_918# D[11] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1312 Z S[12] a_5363_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1313 Z a_4006_599# a_4219_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1314 Z a_8379_793# a_7937_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1315 a_1693_66# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1316 Z S[11] a_4269_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1317 a_119_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1318 a_4269_918# S[11] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1319 a_5361_297# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR D[8] a_117_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Z S[10] a_2695_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X2 VGND D[13] a_6937_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_9250_599# S[15] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X4 a_2695_47# D[2] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VGND D[2] a_2695_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR D[7] a_9463_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_6937_918# S[13] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X8 a_119_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X9 VGND D[0] a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VGND D[6] a_7939_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 Z a_4006_599# a_4219_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X12 VPWR D[13] a_6887_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_6937_66# D[5] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 Z S[11] a_4269_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X15 Z S[14] a_7939_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X16 VGND S[8] a_559_793# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1643_311# a_1430_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X18 Z a_9250_599# a_9463_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X19 a_7939_47# S[6] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X20 VPWR S[8] a_559_793# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X21 VGND D[6] a_7939_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 VGND D[11] a_4269_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VPWR D[12] a_5361_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 Z a_8379_265# a_7937_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X25 VGND D[8] a_119_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 a_4269_918# D[11] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 Z S[12] a_5363_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X28 Z a_3135_793# a_2693_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X29 Z a_5803_793# a_5361_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X30 a_559_265# S[0] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_7939_47# D[6] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X32 a_117_591# D[8] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 VPWR D[11] a_4219_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X34 VPWR D[2] a_2693_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 a_1430_599# S[9] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 a_3135_265# S[2] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_4219_311# a_4006_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X38 a_7937_297# D[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X39 a_9463_613# a_9250_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X40 a_1693_66# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X41 VGND D[2] a_2695_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X42 a_9463_311# D[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X43 Z a_3135_265# a_2693_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X44 Z a_559_793# a_117_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X45 a_5361_591# D[12] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X46 VPWR S[14] a_8379_793# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X47 Z S[0] a_119_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X48 a_4269_66# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X49 Z S[3] a_4269_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X50 a_559_793# S[8] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X51 a_2693_591# a_3135_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X52 VGND S[3] a_4006_325# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X53 VPWR D[8] a_117_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X54 Z S[9] a_1693_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X55 a_4219_613# D[11] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X56 a_1643_311# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X57 a_3135_265# S[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X58 Z S[7] a_9513_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X59 VGND S[14] a_8379_793# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X60 a_2695_911# S[10] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X61 a_9463_613# D[15] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X62 VPWR D[6] a_7937_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X63 Z S[4] a_5363_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X64 VGND S[13] a_6674_599# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X65 a_4269_918# D[11] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X66 Z S[6] a_7939_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X67 Z S[4] a_5363_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X68 a_117_591# a_559_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X69 a_1430_325# S[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X70 a_6887_311# D[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X71 Z S[3] a_4269_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X72 a_2693_591# D[10] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X73 VPWR S[2] a_3135_265# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X74 VGND S[0] a_559_265# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X75 Z a_6674_599# a_6887_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X76 VPWR D[0] a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X77 VGND S[12] a_5803_793# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X78 a_4006_599# S[11] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X79 VGND S[4] a_5803_265# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X80 a_6674_325# S[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X81 a_5803_793# S[12] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X82 a_1693_66# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X83 VGND D[1] a_1693_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X84 Z S[14] a_7939_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X85 VPWR D[5] a_6887_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X86 a_4006_325# S[3] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X87 VPWR D[9] a_1643_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X88 VGND D[5] a_6937_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X89 VGND D[3] a_4269_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X90 a_5361_297# a_5803_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X91 a_4006_599# S[11] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X92 VPWR D[10] a_2693_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X93 a_8379_793# S[14] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X94 a_6937_66# S[5] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X95 a_9250_325# S[7] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X96 Z S[10] a_2695_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X97 a_1643_613# a_1430_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X98 a_9513_66# S[7] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X99 VGND D[8] a_119_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X100 Z a_559_265# a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X101 a_6937_66# S[5] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X102 VPWR S[5] a_6674_325# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X103 VPWR S[12] a_5803_793# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X104 VPWR D[14] a_7937_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X105 VPWR D[4] a_5361_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X106 Z a_8379_793# a_7937_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X107 VGND D[7] a_9513_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X108 a_5363_47# S[4] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X109 Z S[11] a_4269_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X110 a_9513_918# D[15] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X111 a_1693_66# S[1] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X112 a_4269_66# S[3] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X113 VPWR S[15] a_9250_599# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X114 a_117_297# D[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X115 a_559_265# S[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X116 VPWR D[3] a_4219_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X117 VGND D[15] a_9513_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X118 Z a_4006_325# a_4219_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X119 a_5361_297# a_5803_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X120 Z S[8] a_119_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X121 VGND S[15] a_9250_599# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X122 VGND D[10] a_2695_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X123 a_4219_613# a_4006_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X124 a_7939_911# S[14] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X125 a_6887_613# D[13] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X126 Z a_3135_793# a_2693_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X127 VPWR S[3] a_4006_325# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X128 VGND D[1] a_1693_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X129 a_5361_297# D[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X130 Z a_1430_325# a_1643_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X131 VGND D[5] a_6937_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X132 VPWR D[0] a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X133 a_8379_265# S[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X134 a_4219_311# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X135 Z S[2] a_2695_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X136 VGND S[7] a_9250_325# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X137 Z S[5] a_6937_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X138 Z a_5803_265# a_5361_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X139 a_9513_918# S[15] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X140 a_9463_311# D[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X141 a_7937_297# a_8379_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X142 a_2693_297# D[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X143 VGND S[1] a_1430_325# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X144 a_9463_311# a_9250_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X145 a_6937_918# S[13] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X146 a_7937_591# D[14] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X147 a_9513_918# D[15] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X148 a_1643_311# a_1430_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X149 Z S[2] a_2695_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X150 VGND S[9] a_1430_599# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X151 a_9250_599# S[15] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X152 VGND S[2] a_3135_265# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X153 a_2693_297# a_3135_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X154 a_2695_911# D[10] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X155 VPWR D[12] a_5361_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X156 VGND D[10] a_2695_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X157 a_6887_311# a_6674_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X158 a_119_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X159 a_117_591# D[8] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X160 a_2693_591# D[10] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X161 VPWR D[11] a_4219_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X162 VPWR D[1] a_1643_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X163 a_4269_66# S[3] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X164 a_119_47# D[0] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X165 VPWR D[2] a_2693_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X166 a_1693_918# S[9] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X167 a_6937_918# D[13] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X168 a_5361_591# a_5803_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X169 Z S[15] a_9513_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X170 VPWR D[15] a_9463_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X171 a_2695_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X172 a_3135_793# S[10] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X173 Z a_559_793# a_117_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X174 VPWR S[1] a_1430_325# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X175 a_6674_325# S[5] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X176 VPWR D[6] a_7937_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X177 a_7939_47# S[6] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X178 a_5803_265# S[4] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X179 Z a_6674_325# a_6887_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X180 a_3135_793# S[10] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X181 VGND D[14] a_7939_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X182 VGND D[0] a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X183 a_8379_265# S[6] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X184 Z S[8] a_119_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X185 a_1430_599# S[9] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X186 a_4219_613# D[11] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X187 a_2695_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X188 Z a_9250_325# a_9463_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X189 a_7939_911# S[14] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X190 a_2695_911# D[10] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X191 VPWR S[10] a_3135_793# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X192 Z a_4006_599# a_4219_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X193 a_5361_591# a_5803_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X194 a_9250_325# S[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X195 a_6887_311# D[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X196 a_1643_613# D[9] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X197 a_6674_599# S[13] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X198 Z S[12] a_5363_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X199 a_5363_47# D[4] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X200 VGND D[3] a_4269_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X201 a_6887_311# a_6674_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X202 a_9513_918# S[15] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X203 Z S[0] a_119_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X204 a_9513_66# D[7] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X205 Z a_1430_599# a_1643_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X206 VGND D[11] a_4269_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X207 a_7939_911# D[14] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X208 a_119_47# D[0] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X209 a_6937_918# D[13] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X210 a_117_297# a_559_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X211 Z S[1] a_1693_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X212 Z S[7] a_9513_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X213 Z a_8379_265# a_7937_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X214 VGND D[9] a_1693_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X215 a_4269_918# S[11] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X216 Z S[13] a_6937_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X217 Z a_5803_793# a_5361_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X218 VPWR D[9] a_1643_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X219 VPWR S[13] a_6674_599# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X220 a_7937_591# a_8379_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X221 a_119_911# S[8] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X222 VPWR S[0] a_559_265# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X223 Z a_1430_325# a_1643_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X224 Z S[6] a_7939_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X225 a_7937_297# D[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X226 VGND D[15] a_9513_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X227 a_4219_311# a_4006_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X228 Z S[1] a_1693_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X229 a_7939_47# D[6] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X230 a_1643_613# a_1430_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X231 VGND D[12] a_5363_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X232 a_9463_613# a_9250_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X233 VGND S[6] a_8379_265# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X234 a_559_793# S[8] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X235 a_5361_591# D[12] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X236 VPWR D[13] a_6887_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X237 a_7937_297# a_8379_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X238 VPWR D[4] a_5361_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X239 a_2693_591# a_3135_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X240 a_1693_918# S[9] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X241 a_5363_911# S[12] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X242 a_6887_613# a_6674_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X243 Z S[15] a_9513_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X244 a_2693_297# D[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X245 a_4269_66# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X246 VPWR S[11] a_4006_599# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X247 a_7939_911# D[14] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X248 VPWR D[15] a_9463_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X249 a_117_297# D[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X250 VPWR S[6] a_8379_265# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X251 a_5363_47# D[4] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X252 VPWR D[3] a_4219_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X253 Z a_4006_325# a_4219_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X254 a_9513_66# D[7] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X255 VGND D[4] a_5363_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X256 a_1430_325# S[1] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X257 VPWR D[7] a_9463_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X258 a_1693_918# D[9] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X259 a_8379_793# S[14] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X260 VGND D[9] a_1693_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X261 a_9513_66# S[7] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X262 Z a_9250_325# a_9463_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X263 Z a_6674_599# a_6887_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X264 a_5363_911# D[12] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X265 a_5363_47# S[4] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X266 a_4219_311# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X267 VGND D[12] a_5363_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X268 Z a_3135_265# a_2693_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X269 a_1693_66# S[1] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X270 Z a_5803_265# a_5361_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X271 a_119_911# D[8] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X272 VGND S[11] a_4006_599# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X273 a_6674_599# S[13] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X274 Z a_9250_599# a_9463_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X275 Z S[9] a_1693_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X276 VPWR D[10] a_2693_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X277 VGND D[13] a_6937_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X278 a_1643_311# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X279 a_4006_325# S[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X280 a_2695_47# D[2] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X281 a_9463_311# a_9250_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X282 a_5803_265# S[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X283 a_5803_793# S[12] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X284 a_7937_591# D[14] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X285 a_2695_911# S[10] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X286 a_6887_613# a_6674_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X287 a_9463_613# D[15] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X288 Z a_559_265# a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X289 VGND D[4] a_5363_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X290 Z S[13] a_6937_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X291 a_2693_297# a_3135_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X292 VGND D[7] a_9513_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X293 a_1693_918# D[9] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X294 VGND S[10] a_3135_793# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X295 a_117_591# a_559_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X296 a_6937_66# D[5] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X297 Z a_8379_793# a_7937_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X298 Z S[5] a_6937_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X299 a_119_911# S[8] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X300 a_1643_613# D[9] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X301 VGND S[5] a_6674_325# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X302 a_4269_918# S[11] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X303 VPWR D[1] a_1643_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X304 VPWR S[9] a_1430_599# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X305 VPWR S[4] a_5803_265# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X306 Z a_1430_599# a_1643_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X307 VPWR D[14] a_7937_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X308 a_117_297# a_559_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X309 a_5363_911# D[12] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X310 a_4219_613# a_4006_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X311 a_6887_613# D[13] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X312 a_119_911# D[8] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X313 VPWR S[7] a_9250_325# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X314 VPWR D[5] a_6887_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X315 a_5361_297# D[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X316 a_5363_911# S[12] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X317 a_7937_591# a_8379_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X318 VGND D[14] a_7939_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X319 Z a_6674_325# a_6887_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
 .ends
 .subckt sky130_fd_sc_hdll__clkmux2_1 VGND VPWR S A1 A0 X VPB VNB
-M1000 a_245_47# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=4.76e+11p ps=4.08e+06u
-M1001 a_478_47# A0 a_79_21# VNB nshort w=420000u l=150000u
-+  ad=3.591e+11p pd=2.55e+06u as=2.121e+11p ps=1.85e+06u
-M1002 a_79_21# A1 a_245_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=8.058e+11p pd=5.56e+06u as=2.7e+11p ps=2.54e+06u
-M1004 a_599_309# A1 a_79_21# VPB phighvt w=940000u l=180000u
-+  ad=2.444e+11p pd=2.4e+06u as=9.447e+11p ps=3.89e+06u
-M1005 a_243_309# S VPWR VPB phighvt w=940000u l=180000u
-+  ad=3.901e+11p pd=2.71e+06u as=0p ps=0u
-M1006 a_649_21# S VPWR VPB phighvt w=940000u l=180000u
-+  ad=2.726e+11p pd=2.46e+06u as=0p ps=0u
-M1007 a_649_21# S VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1008 VGND a_649_21# a_478_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_79_21# A0 a_243_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_649_21# a_599_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_79_21# X VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
+X0 VPWR S a_649_21# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X1 a_243_309# A0 a_79_21# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X2 X a_79_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VPWR S a_243_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X4 a_79_21# A1 a_599_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X5 VGND S a_649_21# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X6 a_79_21# A0 a_478_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_478_47# a_649_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND S a_245_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 X a_79_21# VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X10 a_245_47# A1 a_79_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_599_309# a_649_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
 .ends
 .subckt sky130_fd_sc_hdll__muxb16to1_2 Z VGND VPWR VNB VPB D[2] D[1] S[7] S[6] S[5]
 + D[9] D[8] S[14] S[13] S[12] S[11] S[10] S[9] S[8] D[15] D[14] D[13] D[12] D[11]
 + D[10] S[15] S[4] S[3] S[2] S[1] S[0] D[7] D[6] D[5] D[4] D[3] D[0]
-M1000 a_2603_911# S[12] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=2.2464e+12p ps=2.528e+07u
-M1001 VPWR S[4] a_2854_265# VPB phighvt w=1e+06u l=180000u
-+  ad=7.52e+12p pd=6.304e+07u as=2.7e+11p ps=2.54e+06u
-M1002 VPWR D[3] a_2112_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1003 VPWR D[2] a_1315_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1004 Z a_1989_47# a_2112_333# VPB phighvt w=820000u l=180000u
-+  ad=3.8048e+12p pd=3.552e+07u as=0p ps=0u
-M1005 Z a_1566_265# a_1315_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Z a_4142_793# a_3891_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1007 VPWR S[12] a_2854_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1008 VPWR D[11] a_2112_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1009 VPWR D[10] a_1315_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1010 a_27_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1011 a_2133_915# D[11] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=3.9312e+12p ps=4.208e+07u
-M1012 VGND S[14] a_4142_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1013 a_27_297# a_278_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_591# D[8] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1015 Z S[10] a_1315_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1016 a_3421_915# S[13] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1017 a_4565_47# S[7] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1018 VGND D[14] a_3891_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1019 a_1989_47# S[3] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1020 a_27_911# S[8] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1021 a_3891_911# S[14] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Z S[5] a_3421_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1023 VPWR S[0] a_278_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1024 a_4709_69# D[7] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1025 a_2133_69# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1026 VGND D[9] a_845_915# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1027 VPWR S[8] a_278_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1028 a_845_69# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1029 Z S[11] a_2133_915# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_2603_297# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1031 Z a_278_265# a_27_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_27_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1033 VGND S[10] a_1566_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1034 a_2603_297# a_2854_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1315_911# D[10] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Z a_701_937# a_824_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1037 Z S[1] a_845_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_2603_591# D[12] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1039 a_701_937# S[9] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1040 a_4565_937# S[15] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1041 Z S[0] a_27_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_27_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_1315_911# S[10] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_1315_591# a_1566_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_2112_591# a_1989_937# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 Z S[4] a_2603_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1047 VGND D[8] a_27_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 Z S[9] a_845_915# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 a_4688_591# a_4565_937# Z VPB phighvt w=820000u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1050 VGND D[7] a_4709_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 a_3400_333# D[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1052 a_824_333# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1053 a_1989_47# S[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1054 a_3421_69# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 a_3400_333# a_3277_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 a_824_591# D[9] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 VGND D[4] a_2603_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 a_3400_591# D[13] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1059 a_845_915# D[9] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 a_1989_937# S[11] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1061 a_4688_333# D[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1062 a_3891_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1063 VGND S[12] a_2854_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1064 VGND S[4] a_2854_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1065 a_3277_47# S[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1066 a_3891_297# a_4142_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1067 a_2133_915# S[11] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1068 a_4688_591# D[15] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 a_3891_591# D[14] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 a_3277_937# S[13] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1071 a_1989_937# S[11] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1072 a_701_47# S[1] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1073 VGND D[12] a_2603_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1074 VGND D[1] a_845_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1075 VPWR D[0] a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1076 Z a_4565_937# a_4688_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 VPWR S[6] a_4142_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1078 VPWR D[8] a_27_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1079 VPWR D[5] a_3400_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1080 VPWR D[4] a_2603_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1081 VGND S[0] a_278_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1082 Z a_3277_47# a_3400_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1083 Z a_2854_265# a_2603_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1084 a_824_333# a_701_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1085 VPWR S[14] a_4142_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1086 a_2603_47# S[4] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1087 VPWR D[13] a_3400_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1088 VPWR D[12] a_2603_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1089 a_701_47# S[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1090 VGND D[5] a_3421_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1091 Z a_4142_265# a_3891_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1092 a_701_937# S[9] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1093 Z a_1989_937# a_2112_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1094 a_2603_47# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1095 Z a_1566_793# a_1315_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1096 a_3277_937# S[13] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1097 VPWR D[1] a_824_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1098 a_3277_47# S[5] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1099 a_27_591# a_278_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1100 VGND D[13] a_3421_915# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1101 VPWR D[9] a_824_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1102 Z S[3] a_2133_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1103 a_2603_911# D[12] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1104 Z S[8] a_27_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1105 a_845_69# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1106 Z S[15] a_4709_915# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1107 Z S[7] a_4709_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1108 VGND D[0] a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1109 VGND D[10] a_1315_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1110 a_3421_69# D[5] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1111 Z a_278_793# a_27_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1112 Z S[6] a_3891_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1113 Z a_701_47# a_824_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1114 a_2603_591# a_2854_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1115 VGND S[8] a_278_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1116 Z S[2] a_1315_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1117 a_1315_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1118 a_27_911# D[8] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1119 a_3891_911# D[14] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1120 a_1315_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1121 a_3421_915# D[13] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1122 a_4688_333# a_4565_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1123 a_2112_333# a_1989_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1124 a_1315_297# a_1566_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1125 a_2133_69# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1126 a_1315_591# D[10] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1127 VGND D[2] a_1315_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1128 Z S[12] a_2603_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1129 a_4565_47# S[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1130 a_845_915# S[9] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1131 a_4709_915# S[15] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1132 a_4565_937# S[15] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1133 VPWR S[2] a_1566_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1134 a_3400_591# a_3277_937# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1135 a_2112_333# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1136 VGND D[11] a_2133_915# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1137 VPWR S[10] a_1566_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1138 a_4709_69# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1139 VGND D[6] a_3891_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1140 a_3891_591# a_4142_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1141 a_2112_591# D[11] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1142 VPWR D[7] a_4688_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1143 VPWR D[6] a_3891_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1144 VGND S[6] a_4142_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1145 a_3891_47# S[6] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1146 Z S[13] a_3421_915# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1147 a_4709_915# D[15] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1148 Z a_4565_47# a_4688_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1149 VPWR D[15] a_4688_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1150 VGND S[2] a_1566_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1151 a_1315_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1152 VPWR D[14] a_3891_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1153 Z S[14] a_3891_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1154 VGND D[15] a_4709_915# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1155 a_3891_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1156 VGND D[3] a_2133_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1157 a_824_591# a_701_937# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1158 Z a_3277_937# a_3400_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1159 Z a_2854_793# a_2603_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_591# D[8] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_1315_47# D[2] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_3421_915# D[13] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_2603_47# D[4] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_3891_47# D[6] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_4709_915# S[15] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X6 a_2112_333# a_1989_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X7 VGND S[13] a_3277_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X8 a_1566_793# S[10] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_3891_47# S[6] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X10 VPWR D[5] a_3400_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 Z a_4142_793# a_3891_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X12 a_27_911# D[8] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VGND D[15] a_4709_915# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 Z a_278_265# a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X15 VGND S[11] a_1989_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X16 Z S[0] a_27_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X17 a_4688_591# D[15] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VGND D[13] a_3421_915# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 Z S[15] a_4709_915# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X20 a_845_69# S[1] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X21 a_4142_793# S[14] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X22 VPWR D[3] a_2112_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 a_1315_911# D[10] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 VPWR S[9] a_701_937# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 Z a_701_937# a_824_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X26 a_3400_591# D[13] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 a_3891_591# D[14] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 VPWR D[12] a_2603_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 a_1315_911# S[10] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X30 a_27_911# S[8] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X31 a_27_297# D[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 VGND D[1] a_845_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X33 Z a_4142_265# a_3891_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X34 a_824_591# a_701_937# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X35 VGND D[3] a_2133_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X36 VGND D[5] a_3421_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X37 VGND S[15] a_4565_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X38 a_27_591# a_278_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X39 a_2112_591# D[11] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X40 a_278_793# S[8] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X41 a_2603_591# D[12] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X42 VPWR D[9] a_824_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X43 VPWR D[10] a_1315_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X44 VGND S[5] a_3277_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X45 a_1566_265# S[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X46 VGND S[7] a_4565_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X47 Z S[10] a_1315_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X48 VPWR S[15] a_4565_937# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X49 a_4688_333# D[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X50 Z a_4565_937# a_4688_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X51 VGND D[6] a_3891_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X52 Z a_701_47# a_824_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X53 a_824_591# D[9] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X54 a_1315_591# D[10] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X55 a_2603_911# D[12] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X56 a_845_69# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X57 a_2133_69# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X58 a_3421_69# D[5] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X59 a_3891_911# S[14] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X60 a_824_333# a_701_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X61 VPWR S[1] a_701_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X62 a_2603_911# S[12] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X63 Z S[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X64 a_3891_297# D[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X65 a_3400_333# D[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X66 a_3891_591# a_4142_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X67 Z a_3277_937# a_3400_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X68 VPWR S[13] a_3277_937# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X69 a_2854_265# S[4] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X70 Z S[4] a_2603_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X71 a_27_297# a_278_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X72 a_4142_793# S[14] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X73 a_4142_265# S[6] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X74 VPWR D[4] a_2603_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X75 VGND D[14] a_3891_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X76 a_27_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X77 VGND S[1] a_701_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X78 VGND D[12] a_2603_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X79 Z S[9] a_845_915# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X80 Z a_4565_47# a_4688_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X81 VPWR D[8] a_27_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X82 Z S[14] a_3891_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X83 a_2112_333# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X84 a_278_265# S[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X85 VGND D[0] a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X86 a_2603_297# D[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X87 a_2854_793# S[12] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X88 VPWR D[1] a_824_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X89 Z S[12] a_2603_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X90 VPWR D[2] a_1315_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X91 a_1315_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X92 a_2603_47# S[4] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X93 a_3891_911# D[14] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X94 Z S[3] a_2133_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X95 VPWR S[7] a_4565_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X96 a_27_47# D[0] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X97 Z S[5] a_3421_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X98 VPWR D[15] a_4688_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X99 a_845_915# D[9] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X100 Z S[7] a_4709_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X101 a_3891_297# a_4142_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X102 Z a_3277_47# a_3400_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X103 a_2133_915# S[11] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X104 a_824_333# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X105 a_1315_297# D[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X106 Z a_2854_793# a_2603_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X107 VGND D[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X108 a_4709_69# D[7] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X109 a_4709_915# D[15] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X110 VGND S[9] a_701_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X111 VPWR S[5] a_3277_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X112 VPWR S[11] a_1989_937# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X113 a_4142_265# S[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X114 VPWR D[14] a_3891_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X115 a_2603_591# a_2854_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X116 a_4688_591# a_4565_937# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X117 VGND D[9] a_845_915# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X118 a_2133_69# S[3] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X119 Z a_1566_793# a_1315_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X120 a_3421_69# S[5] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X121 Z S[11] a_2133_915# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X122 a_4709_69# S[7] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X123 VGND D[7] a_4709_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X124 Z S[1] a_845_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X125 VPWR D[0] a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X126 a_2854_265# S[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X127 a_1315_591# a_1566_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X128 a_3400_591# a_3277_937# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X129 Z a_2854_265# a_2603_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X130 a_2133_915# D[11] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X131 a_3421_915# S[13] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X132 Z a_1989_937# a_2112_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X133 VGND S[3] a_1989_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X134 VPWR D[7] a_4688_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X135 VGND D[10] a_1315_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X136 VPWR D[13] a_3400_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X137 VGND D[8] a_27_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X138 a_845_915# S[9] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X139 a_278_265# S[0] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X140 a_2603_297# a_2854_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X141 a_4688_333# a_4565_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X142 a_2112_591# a_1989_937# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X143 VGND D[4] a_2603_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X144 Z a_1566_265# a_1315_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X145 Z S[8] a_27_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X146 VGND D[11] a_2133_915# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X147 VPWR D[6] a_3891_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X148 Z a_278_793# a_27_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X149 Z S[13] a_3421_915# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X150 VPWR D[11] a_2112_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X151 VPWR S[3] a_1989_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X152 Z S[6] a_3891_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X153 a_1315_297# a_1566_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X154 a_1566_265# S[2] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X155 a_3400_333# a_3277_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X156 a_2854_793# S[12] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X157 Z a_1989_47# a_2112_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X158 a_1566_793# S[10] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X159 a_278_793# S[8] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
 .ends
 .subckt sky130_fd_sc_hdll__muxb4to1_1 S[0] D[0] D[1] S[1] S[2] D[2] D[3] S[3] VPB
 + VNB VGND VPWR Z
-M1000 a_937_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=9.997e+11p ps=9.4e+06u
-M1001 a_1361_47# S[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=1.69e+12p ps=1.338e+07u
-M1002 a_1574_47# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=5.408e+11p ps=6.24e+06u
-M1003 a_734_333# a_533_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=8.856e+11p ps=8.72e+06u
-M1004 Z S[2] a_937_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_1562_333# a_1361_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1006 a_746_47# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1007 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1008 VPWR D[3] a_1562_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Z a_184_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_533_47# S[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1011 a_945_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1012 Z a_1012_265# a_945_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR S[0] a_184_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1014 VPWR S[2] a_1012_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1015 a_1361_47# S[3] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1016 a_533_47# S[1] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1017 VGND S[0] a_184_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1018 VGND D[1] a_746_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR D[1] a_734_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND D[3] a_1574_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_109_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1022 VGND S[2] a_1012_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1023 Z S[0] a_109_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR S[1] a_533_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND D[2] a_937_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_1012_265# S[2] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X3 a_1574_47# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_1012_265# S[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VPWR D[0] a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_109_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X7 VPWR D[2] a_945_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR S[3] a_1361_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_117_297# a_184_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X10 Z a_533_47# a_734_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X11 a_184_265# S[0] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X12 VGND S[3] a_1361_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X13 VGND S[1] a_533_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X14 a_1562_333# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_945_297# a_1012_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X16 VGND D[0] a_109_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 Z a_1361_47# a_1562_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X18 a_937_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X19 Z S[3] a_1574_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X20 Z S[1] a_746_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X21 a_734_333# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 a_184_265# S[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 a_746_47# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
 .subckt sky130_fd_sc_hdll__muxb8to1_4 VGND Z VPWR VNB VPB S[6] D[3] D[0] D[4] D[5]
 + D[2] D[1] D[6] S[2] S[3] S[7] S[0] S[1] S[4] S[5] D[7]
-M1000 a_1313_591# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=9.4224e+12p ps=8.664e+07u
-M1001 VPWR S[0] a_142_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1002 a_3797_297# a_4239_265# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=3.8048e+12p ps=3.552e+07u
-M1003 a_405_66# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=2.2464e+12p ps=2.528e+07u
-M1004 Z a_2626_325# a_2839_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1005 a_3799_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=6.1412e+12p ps=6.128e+07u
-M1006 a_2889_66# S[4] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1007 a_1755_793# S[3] VPWR VPB phighvt w=820000u l=180000u
-+  ad=2.378e+11p pd=2.22e+06u as=0p ps=0u
-M1008 Z S[7] a_3799_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1009 Z S[5] a_2889_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1010 a_355_311# a_142_325# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1011 a_3797_591# a_4239_793# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1012 a_355_311# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND D[2] a_1315_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1014 VGND D[7] a_3799_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1315_911# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1016 Z S[3] a_1315_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_355_613# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1018 VPWR S[5] a_2626_599# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1019 Z a_142_325# a_355_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1315_911# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_2839_613# a_2626_599# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1022 Z S[4] a_2889_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Z a_4239_265# a_3797_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Z S[2] a_1315_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND D[7] a_3799_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_3799_911# D[7] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND D[4] a_2889_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1315_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_405_918# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1030 a_405_918# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Z a_1755_793# a_1313_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_4239_265# S[6] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1033 VGND D[5] a_2889_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_2889_66# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_2889_66# S[4] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1313_591# a_1755_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1315_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Z S[5] a_2889_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_2626_599# S[5] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_142_325# S[0] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 Z a_2626_599# a_2839_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR D[4] a_2839_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND S[0] a_142_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1044 Z S[2] a_1315_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_2889_66# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VPWR D[5] a_2839_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND D[3] a_1315_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_1315_911# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VPWR D[0] a_355_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 Z a_1755_265# a_1313_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1051 Z a_142_325# a_355_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VPWR S[1] a_142_599# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1053 Z a_4239_793# a_3797_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 a_355_613# a_142_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 VPWR D[1] a_355_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 a_2839_613# a_2626_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 a_1315_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 Z S[1] a_405_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 VGND D[1] a_405_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 VGND S[3] a_1755_793# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1061 VGND S[6] a_4239_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 a_2839_311# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 a_3799_911# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 VPWR S[6] a_4239_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1065 a_405_66# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 Z S[4] a_2889_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1067 a_142_325# S[0] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1068 a_405_918# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 VGND D[2] a_1315_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 a_2839_613# D[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1071 VPWR D[2] a_1313_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1072 VPWR S[2] a_1755_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1073 a_1313_297# a_1755_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1074 VGND S[5] a_2626_599# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1075 a_3797_591# a_4239_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1076 VPWR D[3] a_1313_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 a_2889_918# D[5] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1078 Z a_2626_599# a_2839_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1079 VGND D[4] a_2889_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1080 a_355_613# a_142_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1081 VGND D[6] a_3799_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1082 a_3797_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1083 a_405_918# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1084 a_142_599# S[1] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1085 a_4239_265# S[6] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1086 a_355_311# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1087 a_3797_591# D[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1088 a_142_599# S[1] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1089 a_3799_47# S[6] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1090 a_1313_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1091 a_3799_911# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1092 Z a_142_599# a_355_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1093 a_355_613# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1094 VGND S[2] a_1755_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1095 a_1313_591# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1096 Z a_4239_793# a_3797_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1097 VGND D[0] a_405_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1098 a_3799_911# D[7] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1099 a_3797_297# a_4239_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1100 a_405_66# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1101 Z S[6] a_3799_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1102 Z S[1] a_405_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1103 a_1755_265# S[2] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1104 a_1315_911# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1105 VPWR D[4] a_2839_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1106 VGND D[5] a_2889_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1107 a_2889_918# D[5] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1108 VPWR D[6] a_3797_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1109 Z S[0] a_405_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1110 a_2839_311# a_2626_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1111 a_3799_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1112 a_2889_918# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1113 VPWR D[5] a_2839_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1114 a_4239_793# S[7] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1115 a_1755_265# S[2] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1116 Z a_1755_265# a_1313_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1117 VPWR D[7] a_3797_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1118 VPWR D[2] a_1313_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1119 VPWR S[7] a_4239_793# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1120 VPWR D[3] a_1313_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1121 VGND S[4] a_2626_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1122 a_3799_47# S[6] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1123 Z a_142_599# a_355_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1124 Z a_1755_793# a_1313_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1125 VPWR S[3] a_1755_793# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1126 a_1313_297# a_1755_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1127 a_2839_311# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1128 VPWR S[4] a_2626_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1129 a_2626_325# S[4] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1130 a_3797_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1131 Z a_2626_325# a_2839_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1132 Z S[6] a_3799_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1133 Z S[0] a_405_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1134 a_2839_613# D[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1135 Z S[3] a_1315_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1136 VGND D[3] a_1315_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1137 VPWR D[0] a_355_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1138 VGND S[1] a_142_599# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1139 a_3797_591# D[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1140 a_1755_793# S[3] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1141 VPWR D[1] a_355_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1142 a_2889_918# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1143 Z a_4239_265# a_3797_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1144 Z S[7] a_3799_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1145 VPWR D[6] a_3797_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1146 a_2839_311# a_2626_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1147 a_355_311# a_142_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1148 a_4239_793# S[7] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1149 VGND S[7] a_4239_793# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1150 a_1315_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1151 VGND D[0] a_405_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1152 a_1313_591# a_1755_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1153 VPWR D[7] a_3797_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1154 a_2626_599# S[5] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1155 a_2626_325# S[4] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1156 a_405_66# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1157 VGND D[1] a_405_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1158 a_1313_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1159 VGND D[6] a_3799_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND D[4] a_2889_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_1313_297# D[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VGND D[3] a_1315_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_355_613# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_3797_297# a_4239_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X5 VPWR S[6] a_4239_265# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X6 a_1313_591# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VPWR D[2] a_1313_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR D[5] a_2839_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR D[1] a_355_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_4239_793# S[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X11 a_1755_793# S[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X12 a_2839_613# a_2626_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X13 VPWR D[7] a_3797_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 Z S[0] a_405_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X15 a_142_599# S[1] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 Z a_142_325# a_355_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X17 a_1315_911# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 VGND D[3] a_1315_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 Z a_2626_599# a_2839_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X20 a_2626_599# S[5] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 VPWR S[3] a_1755_793# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X22 a_3797_591# D[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 Z S[3] a_1315_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X24 Z S[7] a_3799_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X25 a_355_311# a_142_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X26 a_1313_297# a_1755_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X27 Z a_142_325# a_355_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X28 Z a_4239_793# a_3797_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X29 a_1755_793# S[3] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 VGND S[2] a_1755_265# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_3799_911# S[7] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X32 a_142_325# S[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X33 a_405_66# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X34 a_3799_47# S[6] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X35 a_405_66# D[0] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X36 a_2839_311# a_2626_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X37 a_355_311# D[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X38 a_1315_911# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X39 a_355_311# a_142_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X40 a_3797_591# a_4239_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X41 a_3799_911# D[7] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X42 VPWR S[0] a_142_325# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X43 a_2839_613# D[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X44 VGND D[5] a_2889_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X45 VPWR D[4] a_2839_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X46 a_1313_297# D[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X47 a_355_613# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X48 VPWR S[5] a_2626_599# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X49 a_3799_47# S[6] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X50 a_405_66# D[0] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X51 VPWR D[0] a_355_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X52 VPWR D[6] a_3797_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X53 a_3799_47# D[6] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X54 a_1315_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X55 VGND S[0] a_142_325# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X56 VPWR D[1] a_355_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X57 VGND D[4] a_2889_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X58 Z a_4239_265# a_3797_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X59 Z S[0] a_405_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X60 Z a_142_599# a_355_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X61 a_3799_911# D[7] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X62 VGND D[0] a_405_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X63 VPWR D[7] a_3797_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X64 VPWR D[3] a_1313_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X65 a_3797_297# D[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X66 Z S[1] a_405_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X67 VPWR S[7] a_4239_793# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X68 a_355_613# a_142_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X69 a_1313_591# a_1755_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X70 Z a_142_599# a_355_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X71 Z a_2626_325# a_2839_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X72 VGND S[1] a_142_599# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X73 VGND S[5] a_2626_599# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X74 a_2839_613# a_2626_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X75 a_3799_911# S[7] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X76 a_2626_325# S[4] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X77 a_355_613# a_142_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X78 a_2839_311# D[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X79 a_1315_911# S[3] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X80 a_405_918# S[1] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X81 VGND S[3] a_1755_793# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X82 Z a_1755_265# a_1313_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X83 a_355_311# D[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X84 a_2626_325# S[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X85 a_405_918# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X86 a_2889_66# S[4] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X87 a_1315_47# D[2] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X88 VGND D[1] a_405_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X89 a_142_599# S[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X90 a_1313_297# a_1755_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X91 VPWR D[0] a_355_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X92 Z a_4239_793# a_3797_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X93 VPWR D[6] a_3797_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X94 VPWR D[5] a_2839_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X95 VPWR D[2] a_1313_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X96 Z S[1] a_405_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X97 VPWR S[1] a_142_599# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X98 Z S[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X99 Z a_1755_265# a_1313_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X100 Z S[5] a_2889_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X101 a_142_325# S[0] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X102 VGND D[0] a_405_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X103 a_4239_265# S[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X104 a_405_918# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X105 VGND D[7] a_3799_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X106 VGND D[6] a_3799_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X107 Z S[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X108 a_1755_265# S[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X109 a_2839_613# D[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X110 a_3797_297# a_4239_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X111 a_1315_47# D[2] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X112 VGND D[5] a_2889_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X113 VGND D[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X114 Z a_2626_599# a_2839_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X115 a_405_66# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X116 a_3797_591# D[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X117 a_1315_911# S[3] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X118 a_1313_591# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X119 a_405_918# S[1] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X120 VPWR S[2] a_1755_265# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X121 VGND S[7] a_4239_793# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X122 a_2889_918# S[5] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X123 Z a_1755_793# a_1313_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X124 a_2889_66# S[4] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X125 a_2889_918# S[5] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X126 VPWR D[3] a_1313_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X127 a_4239_265# S[6] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X128 a_2839_311# a_2626_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X129 a_2889_918# D[5] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X130 VGND D[7] a_3799_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X131 VGND D[6] a_3799_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X132 a_1755_265# S[2] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X133 a_1315_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X134 VGND D[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X135 a_1313_591# a_1755_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X136 Z S[3] a_1315_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X137 a_2889_66# D[4] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X138 Z S[4] a_2889_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X139 Z S[7] a_3799_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X140 Z S[6] a_3799_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X141 VGND S[4] a_2626_325# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X142 VPWR D[4] a_2839_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X143 Z a_2626_325# a_2839_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X144 a_4239_793# S[7] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X145 VGND D[1] a_405_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X146 VPWR S[4] a_2626_325# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X147 Z a_1755_793# a_1313_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X148 Z S[4] a_2889_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X149 Z S[6] a_3799_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X150 a_3799_47# D[6] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X151 a_2839_311# D[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X152 a_2626_599# S[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X153 VGND S[6] a_4239_265# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X154 Z a_4239_265# a_3797_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X155 a_2889_918# D[5] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X156 a_3797_591# a_4239_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X157 Z S[5] a_2889_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X158 a_3797_297# D[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X159 a_2889_66# D[4] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
 .subckt sky130_fd_sc_hdll__clkmux2_4 VGND VPWR S A1 A0 X VPB VNB
-M1000 VPWR a_79_199# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.3588e+12p pd=1.066e+07u as=5.8e+11p ps=5.16e+06u
-M1001 VGND a_925_21# a_754_47# VNB nshort w=420000u l=150000u
-+  ad=8.016e+11p pd=7.42e+06u as=3.591e+11p ps=2.55e+06u
-M1002 a_925_21# S VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1003 X a_79_199# VGND VNB nshort w=520000u l=150000u
-+  ad=2.808e+11p pd=3.16e+06u as=0p ps=0u
-M1004 X a_79_199# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_79_199# A1 a_525_47# VNB nshort w=420000u l=150000u
-+  ad=2.121e+11p pd=1.85e+06u as=1.428e+11p ps=1.52e+06u
-M1006 a_925_21# S VPWR VPB phighvt w=940000u l=180000u
-+  ad=2.726e+11p pd=2.46e+06u as=0p ps=0u
-M1007 a_875_309# A1 a_79_199# VPB phighvt w=940000u l=180000u
-+  ad=2.444e+11p pd=2.4e+06u as=9.447e+11p ps=3.89e+06u
-M1008 X a_79_199# VGND VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_754_47# A0 a_79_199# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_79_199# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_79_199# X VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_523_309# S VPWR VPB phighvt w=940000u l=180000u
-+  ad=3.713e+11p pd=2.67e+06u as=0p ps=0u
-M1013 a_79_199# A0 a_523_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_79_199# X VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_79_199# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_525_47# S VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_925_21# a_875_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR S a_523_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X1 X a_79_199# VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X2 a_523_309# A0 a_79_199# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X3 VGND a_79_199# X VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X4 a_79_199# A0 a_754_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR a_79_199# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_79_199# A1 a_875_309# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X7 a_754_47# a_925_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 X a_79_199# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR a_79_199# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 X a_79_199# VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X11 VGND S a_525_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_875_309# a_925_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X13 VGND a_79_199# X VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X14 X a_79_199# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VPWR S a_925_21# VPB sky130_fd_pr__pfet_01v8_hvt w=940000u l=180000u
+X16 a_525_47# A1 a_79_199# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND S a_925_21# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
 .ends
 .subckt sky130_fd_sc_hdll__muxb8to1_2 Z VGND VPWR VNB VPB D[2] D[1] S[7] S[6] S[5]
 + S[4] S[3] S[2] S[1] S[0] D[7] D[6] D[5] D[4] D[3] D[0]
-M1000 VPWR D[2] a_1315_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.76e+12p pd=3.152e+07u as=8.211e+11p ps=7.41e+06u
-M1001 VPWR D[3] a_2112_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1002 VPWR S[4] a_2854_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1003 a_27_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1004 Z a_1566_265# a_1315_297# VPB phighvt w=820000u l=180000u
-+  ad=1.9024e+12p pd=1.776e+07u as=0p ps=0u
-M1005 Z a_1989_47# a_2112_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_297# a_278_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_4565_47# S[7] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=1.9656e+12p ps=2.104e+07u
-M1008 VPWR S[0] a_278_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1009 a_1989_47# S[3] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1010 Z S[5] a_3421_69# VNB nshort w=520000u l=150000u
-+  ad=1.1232e+12p pd=1.264e+07u as=5.6745e+11p ps=5.52e+06u
-M1011 a_4709_69# D[7] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1012 a_2133_69# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1013 Z a_278_265# a_27_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_2603_297# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1015 a_845_69# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1016 a_2603_297# a_2854_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1018 Z S[1] a_845_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Z S[0] a_27_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Z S[4] a_2603_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1022 a_824_333# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1023 a_1989_47# S[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1024 a_3400_333# a_3277_47# Z VPB phighvt w=820000u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1025 a_3400_333# D[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_3421_69# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND D[7] a_4709_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_3277_47# S[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1029 a_3891_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1030 a_4688_333# D[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1031 VGND D[4] a_2603_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND S[4] a_2854_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1033 a_3891_297# a_4142_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR D[0] a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_701_47# S[1] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1036 VGND D[1] a_845_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR D[4] a_2603_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR D[5] a_3400_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR S[6] a_4142_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1040 a_824_333# a_701_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 Z a_2854_265# a_2603_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 Z a_3277_47# a_3400_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND S[0] a_278_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1044 a_2603_47# S[4] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_701_47# S[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1046 Z a_4142_265# a_3891_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND D[5] a_3421_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_2603_47# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VPWR D[1] a_824_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 a_3277_47# S[5] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1051 a_845_69# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 Z S[3] a_2133_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 VGND D[0] a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 a_3421_69# D[5] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 Z S[7] a_4709_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 Z a_701_47# a_824_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 a_1315_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1058 Z S[2] a_1315_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 Z S[6] a_3891_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1060 a_1315_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1061 a_1315_297# a_1566_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 a_2112_333# a_1989_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 VGND D[2] a_1315_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 a_4688_333# a_4565_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 a_2133_69# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 a_4565_47# S[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1067 VPWR S[2] a_1566_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1068 a_2112_333# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 VPWR D[7] a_4688_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 VGND D[6] a_3891_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1071 a_4709_69# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1072 VPWR D[6] a_3891_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1073 Z a_4565_47# a_4688_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1074 a_3891_47# S[6] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1075 VGND S[6] a_4142_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1076 a_1315_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 VGND S[2] a_1566_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1078 VGND D[3] a_2133_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1079 a_3891_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1315_47# D[2] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_2603_47# D[4] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_3891_47# D[6] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_2112_333# a_1989_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X4 VPWR D[5] a_3400_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_3891_47# S[6] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X6 Z a_278_265# a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X7 Z S[0] a_27_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X8 a_845_69# S[1] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X9 VPWR D[3] a_2112_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_27_297# D[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 Z a_4142_265# a_3891_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X12 VGND D[1] a_845_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VGND D[3] a_2133_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VGND D[5] a_3421_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_1566_265# S[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VGND S[5] a_3277_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X17 VGND S[7] a_4565_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X18 Z a_701_47# a_824_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X19 a_4688_333# D[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VGND D[6] a_3891_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 a_845_69# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_2133_69# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 a_3421_69# D[5] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 VPWR S[1] a_701_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 a_824_333# a_701_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X26 a_27_297# a_278_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X27 VPWR D[4] a_2603_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 a_3400_333# D[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 a_3891_297# D[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 Z S[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X31 Z S[4] a_2603_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X32 a_2854_265# S[4] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X33 a_4142_265# S[6] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X34 a_27_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X35 VGND S[1] a_701_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X36 a_278_265# S[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X37 a_2112_333# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X38 Z a_4565_47# a_4688_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X39 VPWR D[1] a_824_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X40 VPWR D[2] a_1315_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X41 a_2603_297# D[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X42 VGND D[0] a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X43 a_27_47# D[0] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X44 a_1315_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X45 VPWR S[7] a_4565_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X46 Z S[3] a_2133_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X47 a_2603_47# S[4] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X48 a_824_333# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X49 a_1315_297# D[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X50 Z a_3277_47# a_3400_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X51 a_3891_297# a_4142_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X52 Z S[5] a_3421_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X53 Z S[7] a_4709_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X54 VGND D[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X55 a_4709_69# D[7] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X56 VPWR S[5] a_3277_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X57 a_4142_265# S[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X58 a_2133_69# S[3] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X59 a_3421_69# S[5] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X60 a_4709_69# S[7] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X61 VPWR D[0] a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X62 a_2854_265# S[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X63 Z S[1] a_845_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X64 VGND D[7] a_4709_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X65 Z a_2854_265# a_2603_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X66 VPWR D[7] a_4688_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X67 VGND S[3] a_1989_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X68 a_2603_297# a_2854_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X69 a_278_265# S[0] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X70 a_4688_333# a_4565_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X71 Z a_1566_265# a_1315_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X72 VGND D[4] a_2603_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X73 VPWR S[3] a_1989_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X74 VPWR D[6] a_3891_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X75 a_1315_297# a_1566_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X76 a_3400_333# a_3277_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X77 a_1566_265# S[2] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X78 Z S[6] a_3891_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X79 Z a_1989_47# a_2112_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
 .ends
 * Top level circuit sky130_fd_sc_hdll__muxb
 Xsky130_fd_sc_hdll__clkmux2_2_0 sky130_fd_sc_hdll__clkmux2_1_0/VGND sky130_fd_sc_hdll__clkmux2_1_0/VPWR
 + sky130_fd_sc_hdll__clkmux2_2_0/S sky130_fd_sc_hdll__clkmux2_2_0/A1 sky130_fd_sc_hdll__clkmux2_2_0/A0
-+ sky130_fd_sc_hdll__clkmux2_2_0/X sky130_fd_sc_hdll__clkmux2_1_0/VPB sky130_fd_sc_hdll__clkmux2_4_0/VNB
-+ sky130_fd_sc_hdll__clkmux2_2
-Xsky130_fd_sc_hdll__muxb4to1_4_0 sky130_fd_sc_hdll__clkmux2_1_0/VPB sky130_fd_sc_hdll__clkmux2_4_0/VNB
-+ sky130_fd_sc_hdll__clkmux2_1_0/VGND sky130_fd_sc_hdll__clkmux2_1_0/VPWR sky130_fd_sc_hdll__muxb4to1_4_0/Z
-+ sky130_fd_sc_hdll__muxb4to1_4_0/S[0] sky130_fd_sc_hdll__muxb4to1_4_0/S[1] sky130_fd_sc_hdll__muxb4to1_4_0/D[1]
-+ sky130_fd_sc_hdll__muxb4to1_4_0/D[2] sky130_fd_sc_hdll__muxb4to1_4_0/S[2] sky130_fd_sc_hdll__muxb4to1_4_0/S[3]
-+ sky130_fd_sc_hdll__muxb4to1_4_0/D[3] sky130_fd_sc_hdll__muxb4to1_4_0/D[0] sky130_fd_sc_hdll__muxb4to1_4
++ sky130_fd_sc_hdll__clkmux2_2_0/X sky130_fd_sc_hdll__clkmux2_1_0/VPB SUBS sky130_fd_sc_hdll__clkmux2_2
+Xsky130_fd_sc_hdll__muxb4to1_4_0 sky130_fd_sc_hdll__clkmux2_1_0/VPB SUBS sky130_fd_sc_hdll__clkmux2_1_0/VGND
++ sky130_fd_sc_hdll__clkmux2_1_0/VPWR sky130_fd_sc_hdll__muxb4to1_4_0/Z sky130_fd_sc_hdll__muxb4to1_4_0/S[0]
++ sky130_fd_sc_hdll__muxb4to1_4_0/S[1] sky130_fd_sc_hdll__muxb4to1_4_0/D[1] sky130_fd_sc_hdll__muxb4to1_4_0/D[2]
++ sky130_fd_sc_hdll__muxb4to1_4_0/S[2] sky130_fd_sc_hdll__muxb4to1_4_0/S[3] sky130_fd_sc_hdll__muxb4to1_4_0/D[3]
++ sky130_fd_sc_hdll__muxb4to1_4_0/D[0] sky130_fd_sc_hdll__muxb4to1_4
 Xsky130_fd_sc_hdll__muxb16to1_1_0 sky130_fd_sc_hdll__muxb16to1_1_0/Z sky130_fd_sc_hdll__clkmux2_1_0/VGND
-+ sky130_fd_sc_hdll__clkmux2_1_0/VPWR sky130_fd_sc_hdll__clkmux2_4_0/VNB sky130_fd_sc_hdll__clkmux2_1_0/VPB
-+ sky130_fd_sc_hdll__muxb16to1_1_0/D[0] sky130_fd_sc_hdll__muxb16to1_1_0/S[12] sky130_fd_sc_hdll__muxb16to1_1_0/S[13]
-+ sky130_fd_sc_hdll__muxb16to1_1_0/S[8] sky130_fd_sc_hdll__muxb16to1_1_0/S[9] sky130_fd_sc_hdll__muxb16to1_1_0/S[10]
-+ sky130_fd_sc_hdll__muxb16to1_1_0/S[11] sky130_fd_sc_hdll__muxb16to1_1_0/S[14] sky130_fd_sc_hdll__muxb16to1_1_0/S[15]
-+ sky130_fd_sc_hdll__muxb16to1_1_0/D[12] sky130_fd_sc_hdll__muxb16to1_1_0/D[9] sky130_fd_sc_hdll__muxb16to1_1_0/D[10]
-+ sky130_fd_sc_hdll__muxb16to1_1_0/D[13] sky130_fd_sc_hdll__muxb16to1_1_0/D[14] sky130_fd_sc_hdll__muxb16to1_1_0/D[15]
-+ sky130_fd_sc_hdll__muxb16to1_1_0/D[8] sky130_fd_sc_hdll__muxb16to1_1_0/D[11] sky130_fd_sc_hdll__muxb16to1_1_0/S[0]
-+ sky130_fd_sc_hdll__muxb16to1_1_0/S[1] sky130_fd_sc_hdll__muxb16to1_1_0/D[1] sky130_fd_sc_hdll__muxb16to1_1_0/D[2]
-+ sky130_fd_sc_hdll__muxb16to1_1_0/S[2] sky130_fd_sc_hdll__muxb16to1_1_0/S[3] sky130_fd_sc_hdll__muxb16to1_1_0/D[4]
-+ sky130_fd_sc_hdll__muxb16to1_1_0/S[4] sky130_fd_sc_hdll__muxb16to1_1_0/S[5] sky130_fd_sc_hdll__muxb16to1_1_0/D[5]
-+ sky130_fd_sc_hdll__muxb16to1_1_0/D[6] sky130_fd_sc_hdll__muxb16to1_1_0/S[6] sky130_fd_sc_hdll__muxb16to1_1_0/S[7]
-+ sky130_fd_sc_hdll__muxb16to1_1_0/D[7] sky130_fd_sc_hdll__muxb16to1_1_0/D[3] sky130_fd_sc_hdll__muxb16to1_1
++ sky130_fd_sc_hdll__clkmux2_1_0/VPWR SUBS sky130_fd_sc_hdll__clkmux2_1_0/VPB sky130_fd_sc_hdll__muxb16to1_1_0/D[0]
++ sky130_fd_sc_hdll__muxb16to1_1_0/S[12] sky130_fd_sc_hdll__muxb16to1_1_0/S[13] sky130_fd_sc_hdll__muxb16to1_1_0/S[8]
++ sky130_fd_sc_hdll__muxb16to1_1_0/S[9] sky130_fd_sc_hdll__muxb16to1_1_0/S[10] sky130_fd_sc_hdll__muxb16to1_1_0/S[11]
++ sky130_fd_sc_hdll__muxb16to1_1_0/S[14] sky130_fd_sc_hdll__muxb16to1_1_0/S[15] sky130_fd_sc_hdll__muxb16to1_1_0/D[12]
++ sky130_fd_sc_hdll__muxb16to1_1_0/D[9] sky130_fd_sc_hdll__muxb16to1_1_0/D[10] sky130_fd_sc_hdll__muxb16to1_1_0/D[13]
++ sky130_fd_sc_hdll__muxb16to1_1_0/D[14] sky130_fd_sc_hdll__muxb16to1_1_0/D[15] sky130_fd_sc_hdll__muxb16to1_1_0/D[8]
++ sky130_fd_sc_hdll__muxb16to1_1_0/D[11] sky130_fd_sc_hdll__muxb16to1_1_0/S[0] sky130_fd_sc_hdll__muxb16to1_1_0/S[1]
++ sky130_fd_sc_hdll__muxb16to1_1_0/D[1] sky130_fd_sc_hdll__muxb16to1_1_0/D[2] sky130_fd_sc_hdll__muxb16to1_1_0/S[2]
++ sky130_fd_sc_hdll__muxb16to1_1_0/S[3] sky130_fd_sc_hdll__muxb16to1_1_0/D[4] sky130_fd_sc_hdll__muxb16to1_1_0/S[4]
++ sky130_fd_sc_hdll__muxb16to1_1_0/S[5] sky130_fd_sc_hdll__muxb16to1_1_0/D[5] sky130_fd_sc_hdll__muxb16to1_1_0/D[6]
++ sky130_fd_sc_hdll__muxb16to1_1_0/S[6] sky130_fd_sc_hdll__muxb16to1_1_0/S[7] sky130_fd_sc_hdll__muxb16to1_1_0/D[7]
++ sky130_fd_sc_hdll__muxb16to1_1_0/D[3] sky130_fd_sc_hdll__muxb16to1_1
 Xsky130_fd_sc_hdll__muxb4to1_2_0 sky130_fd_sc_hdll__clkmux2_1_0/VGND sky130_fd_sc_hdll__clkmux2_1_0/VPWR
-+ sky130_fd_sc_hdll__muxb4to1_2_0/Z sky130_fd_sc_hdll__clkmux2_4_0/VNB sky130_fd_sc_hdll__clkmux2_1_0/VPB
-+ sky130_fd_sc_hdll__muxb4to1_2_0/S[1] sky130_fd_sc_hdll__muxb4to1_2_0/S[2] sky130_fd_sc_hdll__muxb4to1_2_0/S[3]
-+ sky130_fd_sc_hdll__muxb4to1_2_0/D[1] sky130_fd_sc_hdll__muxb4to1_2_0/D[0] sky130_fd_sc_hdll__muxb4to1_2_0/D[2]
-+ sky130_fd_sc_hdll__muxb4to1_2_0/D[3] sky130_fd_sc_hdll__muxb4to1_2_0/S[0] sky130_fd_sc_hdll__muxb4to1_2
++ sky130_fd_sc_hdll__muxb4to1_2_0/Z SUBS sky130_fd_sc_hdll__clkmux2_1_0/VPB sky130_fd_sc_hdll__muxb4to1_2_0/S[1]
++ sky130_fd_sc_hdll__muxb4to1_2_0/S[2] sky130_fd_sc_hdll__muxb4to1_2_0/S[3] sky130_fd_sc_hdll__muxb4to1_2_0/D[1]
++ sky130_fd_sc_hdll__muxb4to1_2_0/D[0] sky130_fd_sc_hdll__muxb4to1_2_0/D[2] sky130_fd_sc_hdll__muxb4to1_2_0/D[3]
++ sky130_fd_sc_hdll__muxb4to1_2_0/S[0] sky130_fd_sc_hdll__muxb4to1_2
 Xsky130_fd_sc_hdll__muxb8to1_1_0 sky130_fd_sc_hdll__clkmux2_1_0/VGND sky130_fd_sc_hdll__muxb8to1_1_0/Z
-+ sky130_fd_sc_hdll__clkmux2_1_0/VPWR sky130_fd_sc_hdll__clkmux2_4_0/VNB sky130_fd_sc_hdll__clkmux2_1_0/VPB
-+ sky130_fd_sc_hdll__muxb8to1_1_0/D[0] sky130_fd_sc_hdll__muxb8to1_1_0/S[0] sky130_fd_sc_hdll__muxb8to1_1_0/S[1]
-+ sky130_fd_sc_hdll__muxb8to1_1_0/D[1] sky130_fd_sc_hdll__muxb8to1_1_0/D[2] sky130_fd_sc_hdll__muxb8to1_1_0/S[2]
-+ sky130_fd_sc_hdll__muxb8to1_1_0/S[3] sky130_fd_sc_hdll__muxb8to1_1_0/D[4] sky130_fd_sc_hdll__muxb8to1_1_0/S[4]
-+ sky130_fd_sc_hdll__muxb8to1_1_0/S[5] sky130_fd_sc_hdll__muxb8to1_1_0/D[5] sky130_fd_sc_hdll__muxb8to1_1_0/D[6]
-+ sky130_fd_sc_hdll__muxb8to1_1_0/S[6] sky130_fd_sc_hdll__muxb8to1_1_0/S[7] sky130_fd_sc_hdll__muxb8to1_1_0/D[7]
-+ sky130_fd_sc_hdll__muxb8to1_1_0/D[3] sky130_fd_sc_hdll__muxb8to1_1
++ sky130_fd_sc_hdll__clkmux2_1_0/VPWR SUBS sky130_fd_sc_hdll__clkmux2_1_0/VPB sky130_fd_sc_hdll__muxb8to1_1_0/D[0]
++ sky130_fd_sc_hdll__muxb8to1_1_0/S[0] sky130_fd_sc_hdll__muxb8to1_1_0/S[1] sky130_fd_sc_hdll__muxb8to1_1_0/D[1]
++ sky130_fd_sc_hdll__muxb8to1_1_0/D[2] sky130_fd_sc_hdll__muxb8to1_1_0/S[2] sky130_fd_sc_hdll__muxb8to1_1_0/S[3]
++ sky130_fd_sc_hdll__muxb8to1_1_0/D[4] sky130_fd_sc_hdll__muxb8to1_1_0/S[4] sky130_fd_sc_hdll__muxb8to1_1_0/S[5]
++ sky130_fd_sc_hdll__muxb8to1_1_0/D[5] sky130_fd_sc_hdll__muxb8to1_1_0/D[6] sky130_fd_sc_hdll__muxb8to1_1_0/S[6]
++ sky130_fd_sc_hdll__muxb8to1_1_0/S[7] sky130_fd_sc_hdll__muxb8to1_1_0/D[7] sky130_fd_sc_hdll__muxb8to1_1_0/D[3]
++ sky130_fd_sc_hdll__muxb8to1_1
 Xsky130_fd_sc_hdll__muxb16to1_4_0 sky130_fd_sc_hdll__clkmux2_1_0/VGND sky130_fd_sc_hdll__muxb16to1_4_0/Z
-+ sky130_fd_sc_hdll__clkmux2_1_0/VPWR sky130_fd_sc_hdll__clkmux2_4_0/VNB sky130_fd_sc_hdll__clkmux2_1_0/VPB
-+ sky130_fd_sc_hdll__muxb16to1_4_0/S[6] sky130_fd_sc_hdll__muxb16to1_4_0/S[10] sky130_fd_sc_hdll__muxb16to1_4_0/D[12]
-+ sky130_fd_sc_hdll__muxb16to1_4_0/D[13] sky130_fd_sc_hdll__muxb16to1_4_0/D[8] sky130_fd_sc_hdll__muxb16to1_4_0/D[15]
-+ sky130_fd_sc_hdll__muxb16to1_4_0/D[10] sky130_fd_sc_hdll__muxb16to1_4_0/D[9] sky130_fd_sc_hdll__muxb16to1_4_0/D[14]
-+ sky130_fd_sc_hdll__muxb16to1_4_0/S[14] sky130_fd_sc_hdll__muxb16to1_4_0/D[11] sky130_fd_sc_hdll__muxb16to1_4_0/S[11]
-+ sky130_fd_sc_hdll__muxb16to1_4_0/S[8] sky130_fd_sc_hdll__muxb16to1_4_0/S[15] sky130_fd_sc_hdll__muxb16to1_4_0/S[12]
-+ sky130_fd_sc_hdll__muxb16to1_4_0/S[9] sky130_fd_sc_hdll__muxb16to1_4_0/S[13] sky130_fd_sc_hdll__muxb16to1_4_0/D[3]
-+ sky130_fd_sc_hdll__muxb16to1_4_0/D[0] sky130_fd_sc_hdll__muxb16to1_4_0/D[4] sky130_fd_sc_hdll__muxb16to1_4_0/D[5]
-+ sky130_fd_sc_hdll__muxb16to1_4_0/D[2] sky130_fd_sc_hdll__muxb16to1_4_0/D[1] sky130_fd_sc_hdll__muxb16to1_4_0/D[6]
-+ sky130_fd_sc_hdll__muxb16to1_4_0/S[2] sky130_fd_sc_hdll__muxb16to1_4_0/S[3] sky130_fd_sc_hdll__muxb16to1_4_0/S[7]
-+ sky130_fd_sc_hdll__muxb16to1_4_0/S[0] sky130_fd_sc_hdll__muxb16to1_4_0/S[1] sky130_fd_sc_hdll__muxb16to1_4_0/S[4]
-+ sky130_fd_sc_hdll__muxb16to1_4_0/S[5] sky130_fd_sc_hdll__muxb16to1_4_0/D[7] sky130_fd_sc_hdll__muxb16to1_4
++ sky130_fd_sc_hdll__clkmux2_1_0/VPWR SUBS sky130_fd_sc_hdll__clkmux2_1_0/VPB sky130_fd_sc_hdll__muxb16to1_4_0/S[6]
++ sky130_fd_sc_hdll__muxb16to1_4_0/S[10] sky130_fd_sc_hdll__muxb16to1_4_0/D[12] sky130_fd_sc_hdll__muxb16to1_4_0/D[13]
++ sky130_fd_sc_hdll__muxb16to1_4_0/D[8] sky130_fd_sc_hdll__muxb16to1_4_0/D[15] sky130_fd_sc_hdll__muxb16to1_4_0/D[10]
++ sky130_fd_sc_hdll__muxb16to1_4_0/D[9] sky130_fd_sc_hdll__muxb16to1_4_0/D[14] sky130_fd_sc_hdll__muxb16to1_4_0/S[14]
++ sky130_fd_sc_hdll__muxb16to1_4_0/D[11] sky130_fd_sc_hdll__muxb16to1_4_0/S[11] sky130_fd_sc_hdll__muxb16to1_4_0/S[8]
++ sky130_fd_sc_hdll__muxb16to1_4_0/S[15] sky130_fd_sc_hdll__muxb16to1_4_0/S[12] sky130_fd_sc_hdll__muxb16to1_4_0/S[9]
++ sky130_fd_sc_hdll__muxb16to1_4_0/S[13] sky130_fd_sc_hdll__muxb16to1_4_0/D[3] sky130_fd_sc_hdll__muxb16to1_4_0/D[0]
++ sky130_fd_sc_hdll__muxb16to1_4_0/D[4] sky130_fd_sc_hdll__muxb16to1_4_0/D[5] sky130_fd_sc_hdll__muxb16to1_4_0/D[2]
++ sky130_fd_sc_hdll__muxb16to1_4_0/D[1] sky130_fd_sc_hdll__muxb16to1_4_0/D[6] sky130_fd_sc_hdll__muxb16to1_4_0/S[2]
++ sky130_fd_sc_hdll__muxb16to1_4_0/S[3] sky130_fd_sc_hdll__muxb16to1_4_0/S[7] sky130_fd_sc_hdll__muxb16to1_4_0/S[0]
++ sky130_fd_sc_hdll__muxb16to1_4_0/S[1] sky130_fd_sc_hdll__muxb16to1_4_0/S[4] sky130_fd_sc_hdll__muxb16to1_4_0/S[5]
++ sky130_fd_sc_hdll__muxb16to1_4_0/D[7] sky130_fd_sc_hdll__muxb16to1_4
 Xsky130_fd_sc_hdll__clkmux2_1_0 sky130_fd_sc_hdll__clkmux2_1_0/VGND sky130_fd_sc_hdll__clkmux2_1_0/VPWR
 + sky130_fd_sc_hdll__clkmux2_1_0/S sky130_fd_sc_hdll__clkmux2_1_0/A1 sky130_fd_sc_hdll__clkmux2_1_0/A0
-+ sky130_fd_sc_hdll__clkmux2_1_0/X sky130_fd_sc_hdll__clkmux2_1_0/VPB sky130_fd_sc_hdll__clkmux2_4_0/VNB
-+ sky130_fd_sc_hdll__clkmux2_1
++ sky130_fd_sc_hdll__clkmux2_1_0/X sky130_fd_sc_hdll__clkmux2_1_0/VPB SUBS sky130_fd_sc_hdll__clkmux2_1
 Xsky130_fd_sc_hdll__muxb16to1_2_0 sky130_fd_sc_hdll__muxb16to1_2_0/Z sky130_fd_sc_hdll__clkmux2_1_0/VGND
-+ sky130_fd_sc_hdll__clkmux2_1_0/VPWR sky130_fd_sc_hdll__clkmux2_4_0/VNB sky130_fd_sc_hdll__clkmux2_1_0/VPB
-+ sky130_fd_sc_hdll__muxb16to1_2_0/D[2] sky130_fd_sc_hdll__muxb16to1_2_0/D[1] sky130_fd_sc_hdll__muxb16to1_2_0/S[7]
-+ sky130_fd_sc_hdll__muxb16to1_2_0/S[6] sky130_fd_sc_hdll__muxb16to1_2_0/S[5] sky130_fd_sc_hdll__muxb16to1_2_0/D[9]
-+ sky130_fd_sc_hdll__muxb16to1_2_0/D[8] sky130_fd_sc_hdll__muxb16to1_2_0/S[14] sky130_fd_sc_hdll__muxb16to1_2_0/S[13]
-+ sky130_fd_sc_hdll__muxb16to1_2_0/S[12] sky130_fd_sc_hdll__muxb16to1_2_0/S[11] sky130_fd_sc_hdll__muxb16to1_2_0/S[10]
-+ sky130_fd_sc_hdll__muxb16to1_2_0/S[9] sky130_fd_sc_hdll__muxb16to1_2_0/S[8] sky130_fd_sc_hdll__muxb16to1_2_0/D[15]
-+ sky130_fd_sc_hdll__muxb16to1_2_0/D[14] sky130_fd_sc_hdll__muxb16to1_2_0/D[13] sky130_fd_sc_hdll__muxb16to1_2_0/D[12]
-+ sky130_fd_sc_hdll__muxb16to1_2_0/D[11] sky130_fd_sc_hdll__muxb16to1_2_0/D[10] sky130_fd_sc_hdll__muxb16to1_2_0/S[15]
-+ sky130_fd_sc_hdll__muxb16to1_2_0/S[4] sky130_fd_sc_hdll__muxb16to1_2_0/S[3] sky130_fd_sc_hdll__muxb16to1_2_0/S[2]
-+ sky130_fd_sc_hdll__muxb16to1_2_0/S[1] sky130_fd_sc_hdll__muxb16to1_2_0/S[0] sky130_fd_sc_hdll__muxb16to1_2_0/D[7]
-+ sky130_fd_sc_hdll__muxb16to1_2_0/D[6] sky130_fd_sc_hdll__muxb16to1_2_0/D[5] sky130_fd_sc_hdll__muxb16to1_2_0/D[4]
-+ sky130_fd_sc_hdll__muxb16to1_2_0/D[3] sky130_fd_sc_hdll__muxb16to1_2_0/D[0] sky130_fd_sc_hdll__muxb16to1_2
++ sky130_fd_sc_hdll__clkmux2_1_0/VPWR SUBS sky130_fd_sc_hdll__clkmux2_1_0/VPB sky130_fd_sc_hdll__muxb16to1_2_0/D[2]
++ sky130_fd_sc_hdll__muxb16to1_2_0/D[1] sky130_fd_sc_hdll__muxb16to1_2_0/S[7] sky130_fd_sc_hdll__muxb16to1_2_0/S[6]
++ sky130_fd_sc_hdll__muxb16to1_2_0/S[5] sky130_fd_sc_hdll__muxb16to1_2_0/D[9] sky130_fd_sc_hdll__muxb16to1_2_0/D[8]
++ sky130_fd_sc_hdll__muxb16to1_2_0/S[14] sky130_fd_sc_hdll__muxb16to1_2_0/S[13] sky130_fd_sc_hdll__muxb16to1_2_0/S[12]
++ sky130_fd_sc_hdll__muxb16to1_2_0/S[11] sky130_fd_sc_hdll__muxb16to1_2_0/S[10] sky130_fd_sc_hdll__muxb16to1_2_0/S[9]
++ sky130_fd_sc_hdll__muxb16to1_2_0/S[8] sky130_fd_sc_hdll__muxb16to1_2_0/D[15] sky130_fd_sc_hdll__muxb16to1_2_0/D[14]
++ sky130_fd_sc_hdll__muxb16to1_2_0/D[13] sky130_fd_sc_hdll__muxb16to1_2_0/D[12] sky130_fd_sc_hdll__muxb16to1_2_0/D[11]
++ sky130_fd_sc_hdll__muxb16to1_2_0/D[10] sky130_fd_sc_hdll__muxb16to1_2_0/S[15] sky130_fd_sc_hdll__muxb16to1_2_0/S[4]
++ sky130_fd_sc_hdll__muxb16to1_2_0/S[3] sky130_fd_sc_hdll__muxb16to1_2_0/S[2] sky130_fd_sc_hdll__muxb16to1_2_0/S[1]
++ sky130_fd_sc_hdll__muxb16to1_2_0/S[0] sky130_fd_sc_hdll__muxb16to1_2_0/D[7] sky130_fd_sc_hdll__muxb16to1_2_0/D[6]
++ sky130_fd_sc_hdll__muxb16to1_2_0/D[5] sky130_fd_sc_hdll__muxb16to1_2_0/D[4] sky130_fd_sc_hdll__muxb16to1_2_0/D[3]
++ sky130_fd_sc_hdll__muxb16to1_2_0/D[0] sky130_fd_sc_hdll__muxb16to1_2
 Xsky130_fd_sc_hdll__muxb4to1_1_0 sky130_fd_sc_hdll__muxb4to1_1_0/S[0] sky130_fd_sc_hdll__muxb4to1_1_0/D[0]
 + sky130_fd_sc_hdll__muxb4to1_1_0/D[1] sky130_fd_sc_hdll__muxb4to1_1_0/S[1] sky130_fd_sc_hdll__muxb4to1_1_0/S[2]
 + sky130_fd_sc_hdll__muxb4to1_1_0/D[2] sky130_fd_sc_hdll__muxb4to1_1_0/D[3] sky130_fd_sc_hdll__muxb4to1_1_0/S[3]
-+ sky130_fd_sc_hdll__clkmux2_1_0/VPB sky130_fd_sc_hdll__clkmux2_4_0/VNB sky130_fd_sc_hdll__clkmux2_1_0/VGND
-+ sky130_fd_sc_hdll__clkmux2_1_0/VPWR sky130_fd_sc_hdll__muxb4to1_1_0/Z sky130_fd_sc_hdll__muxb4to1_1
++ sky130_fd_sc_hdll__clkmux2_1_0/VPB SUBS sky130_fd_sc_hdll__clkmux2_1_0/VGND sky130_fd_sc_hdll__clkmux2_1_0/VPWR
++ sky130_fd_sc_hdll__muxb4to1_1_0/Z sky130_fd_sc_hdll__muxb4to1_1
 Xsky130_fd_sc_hdll__muxb8to1_4_0 sky130_fd_sc_hdll__clkmux2_1_0/VGND sky130_fd_sc_hdll__muxb8to1_4_0/Z
-+ sky130_fd_sc_hdll__clkmux2_1_0/VPWR sky130_fd_sc_hdll__clkmux2_4_0/VNB sky130_fd_sc_hdll__clkmux2_1_0/VPB
-+ sky130_fd_sc_hdll__muxb8to1_4_0/S[6] sky130_fd_sc_hdll__muxb8to1_4_0/D[3] sky130_fd_sc_hdll__muxb8to1_4_0/D[0]
-+ sky130_fd_sc_hdll__muxb8to1_4_0/D[4] sky130_fd_sc_hdll__muxb8to1_4_0/D[5] sky130_fd_sc_hdll__muxb8to1_4_0/D[2]
-+ sky130_fd_sc_hdll__muxb8to1_4_0/D[1] sky130_fd_sc_hdll__muxb8to1_4_0/D[6] sky130_fd_sc_hdll__muxb8to1_4_0/S[2]
-+ sky130_fd_sc_hdll__muxb8to1_4_0/S[3] sky130_fd_sc_hdll__muxb8to1_4_0/S[7] sky130_fd_sc_hdll__muxb8to1_4_0/S[0]
-+ sky130_fd_sc_hdll__muxb8to1_4_0/S[1] sky130_fd_sc_hdll__muxb8to1_4_0/S[4] sky130_fd_sc_hdll__muxb8to1_4_0/S[5]
-+ sky130_fd_sc_hdll__muxb8to1_4_0/D[7] sky130_fd_sc_hdll__muxb8to1_4
++ sky130_fd_sc_hdll__clkmux2_1_0/VPWR SUBS sky130_fd_sc_hdll__clkmux2_1_0/VPB sky130_fd_sc_hdll__muxb8to1_4_0/S[6]
++ sky130_fd_sc_hdll__muxb8to1_4_0/D[3] sky130_fd_sc_hdll__muxb8to1_4_0/D[0] sky130_fd_sc_hdll__muxb8to1_4_0/D[4]
++ sky130_fd_sc_hdll__muxb8to1_4_0/D[5] sky130_fd_sc_hdll__muxb8to1_4_0/D[2] sky130_fd_sc_hdll__muxb8to1_4_0/D[1]
++ sky130_fd_sc_hdll__muxb8to1_4_0/D[6] sky130_fd_sc_hdll__muxb8to1_4_0/S[2] sky130_fd_sc_hdll__muxb8to1_4_0/S[3]
++ sky130_fd_sc_hdll__muxb8to1_4_0/S[7] sky130_fd_sc_hdll__muxb8to1_4_0/S[0] sky130_fd_sc_hdll__muxb8to1_4_0/S[1]
++ sky130_fd_sc_hdll__muxb8to1_4_0/S[4] sky130_fd_sc_hdll__muxb8to1_4_0/S[5] sky130_fd_sc_hdll__muxb8to1_4_0/D[7]
++ sky130_fd_sc_hdll__muxb8to1_4
 Xsky130_fd_sc_hdll__clkmux2_4_0 sky130_fd_sc_hdll__clkmux2_1_0/VGND sky130_fd_sc_hdll__clkmux2_1_0/VPWR
 + sky130_fd_sc_hdll__clkmux2_4_0/S sky130_fd_sc_hdll__clkmux2_4_0/A1 sky130_fd_sc_hdll__clkmux2_4_0/A0
-+ sky130_fd_sc_hdll__clkmux2_4_0/X sky130_fd_sc_hdll__clkmux2_1_0/VPB sky130_fd_sc_hdll__clkmux2_4_0/VNB
-+ sky130_fd_sc_hdll__clkmux2_4
++ sky130_fd_sc_hdll__clkmux2_4_0/X sky130_fd_sc_hdll__clkmux2_1_0/VPB SUBS sky130_fd_sc_hdll__clkmux2_4
 Xsky130_fd_sc_hdll__muxb8to1_2_0 sky130_fd_sc_hdll__muxb8to1_2_0/Z sky130_fd_sc_hdll__clkmux2_1_0/VGND
-+ sky130_fd_sc_hdll__clkmux2_1_0/VPWR sky130_fd_sc_hdll__clkmux2_4_0/VNB sky130_fd_sc_hdll__clkmux2_1_0/VPB
-+ sky130_fd_sc_hdll__muxb8to1_2_0/D[2] sky130_fd_sc_hdll__muxb8to1_2_0/D[1] sky130_fd_sc_hdll__muxb8to1_2_0/S[7]
-+ sky130_fd_sc_hdll__muxb8to1_2_0/S[6] sky130_fd_sc_hdll__muxb8to1_2_0/S[5] sky130_fd_sc_hdll__muxb8to1_2_0/S[4]
-+ sky130_fd_sc_hdll__muxb8to1_2_0/S[3] sky130_fd_sc_hdll__muxb8to1_2_0/S[2] sky130_fd_sc_hdll__muxb8to1_2_0/S[1]
-+ sky130_fd_sc_hdll__muxb8to1_2_0/S[0] sky130_fd_sc_hdll__muxb8to1_2_0/D[7] sky130_fd_sc_hdll__muxb8to1_2_0/D[6]
-+ sky130_fd_sc_hdll__muxb8to1_2_0/D[5] sky130_fd_sc_hdll__muxb8to1_2_0/D[4] sky130_fd_sc_hdll__muxb8to1_2_0/D[3]
-+ sky130_fd_sc_hdll__muxb8to1_2_0/D[0] sky130_fd_sc_hdll__muxb8to1_2
++ sky130_fd_sc_hdll__clkmux2_1_0/VPWR SUBS sky130_fd_sc_hdll__clkmux2_1_0/VPB sky130_fd_sc_hdll__muxb8to1_2_0/D[2]
++ sky130_fd_sc_hdll__muxb8to1_2_0/D[1] sky130_fd_sc_hdll__muxb8to1_2_0/S[7] sky130_fd_sc_hdll__muxb8to1_2_0/S[6]
++ sky130_fd_sc_hdll__muxb8to1_2_0/S[5] sky130_fd_sc_hdll__muxb8to1_2_0/S[4] sky130_fd_sc_hdll__muxb8to1_2_0/S[3]
++ sky130_fd_sc_hdll__muxb8to1_2_0/S[2] sky130_fd_sc_hdll__muxb8to1_2_0/S[1] sky130_fd_sc_hdll__muxb8to1_2_0/S[0]
++ sky130_fd_sc_hdll__muxb8to1_2_0/D[7] sky130_fd_sc_hdll__muxb8to1_2_0/D[6] sky130_fd_sc_hdll__muxb8to1_2_0/D[5]
++ sky130_fd_sc_hdll__muxb8to1_2_0/D[4] sky130_fd_sc_hdll__muxb8to1_2_0/D[3] sky130_fd_sc_hdll__muxb8to1_2_0/D[0]
++ sky130_fd_sc_hdll__muxb8to1_2
 .end
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.cdl b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.cdl
index e67a403..5135140 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.cdl
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.cdl
@@ -20,196 +20,196 @@
 *.PININFO D[0]:I S[15]:I S[14]:I S[13]:I S[12]:I S[11]:I S[10]:I
 *.PININFO S[9]:I S[8]:I S[7]:I S[6]:I S[5]:I S[4]:I S[3]:I S[2]:I
 *.PININFO S[1]:I S[0]:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMNA00 Z S[0] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Z S[0] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 net87 D[0] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA01 net87 D[0] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 SB0 S[0] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 Z S[2] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net51 D[2] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 SB2 S[2] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 SB3 S[3] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 net63 D[3] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Z S[3] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Z S[1] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net75 D[1] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 SB1 S[1] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI67 Z S[4] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI66 net073 D[4] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI65 SB4 S[4] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI64 Z S[6] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI63 net085 D[6] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI62 SB6 S[6] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI61 SB7 S[7] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI60 net097 D[7] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI59 Z S[7] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI58 Z S[5] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI57 net0109 D[5] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN1 SB0 S[0] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI56 SB5 S[5] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI30 Z S[2] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI136 Z S[8] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI135 net0210 D[8] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI29 net51 D[2] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI134 SB8 S[8] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI28 SB2 S[2] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI133 Z S[9] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI27 SB3 S[3] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI132 net0222 D[9] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI26 net63 D[3] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI131 SB9 S[9] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI25 Z S[3] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI130 Z S[12] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI13 Z S[1] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI129 net0234 D[12] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI12 net75 D[1] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI128 SB12 S[12] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 SB1 S[1] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI127 Z S[13] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI67 Z S[4] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI126 net0246 D[13] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI66 net073 D[4] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI125 SB13 S[13] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI65 SB4 S[4] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI124 Z S[10] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI64 Z S[6] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI123 net0258 D[10] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI63 net085 D[6] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI122 SB10 S[10] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI62 SB6 S[6] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI121 SB11 S[11] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI61 SB7 S[7] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI120 net0270 D[11] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI60 net097 D[7] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI119 Z S[11] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI59 Z S[7] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI118 Z S[14] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI58 Z S[5] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI117 net0282 D[14] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI57 net0109 D[5] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI116 SB14 S[14] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI56 SB5 S[5] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI115 SB15 S[15] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI136 Z S[8] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI114 net0294 D[15] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI135 net0210 D[8] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI113 Z S[15] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 net99 SB2 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 SB2 S[2] 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
-MMPA00 VPWR D[0] 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
-MMPA01 net135 SB0 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI134 SB8 S[8] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 SB3 S[3] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI133 Z S[9] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net111 SB3 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 VPWR D[3] 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
-MMIP1 SB0 S[0] 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
-MI15 net123 SB1 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 VPWR D[1] 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
-MI14 SB1 S[1] 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
-MI36 VPWR D[2] 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
-MI79 net0165 SB6 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI132 net0222 D[9] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI78 SB6 S[6] VPB 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
-MI77 VPWR D[4] 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
-MI76 net0177 SB4 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI131 SB9 S[9] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI75 SB7 S[7] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI130 Z S[12] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI74 net0185 SB7 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI129 net0234 D[12] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI73 VPWR D[7] 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
-MI72 SB4 S[4] 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
-MI71 net0197 SB5 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI128 SB12 S[12] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI70 VPWR D[5] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI127 Z S[13] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI69 SB5 S[5] 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
-MI68 VPWR D[6] 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
-MI160 VPWR D[8] 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
-MI159 net0402 SB8 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI126 net0246 D[13] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI158 SB8 S[8] 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
-MI157 net0410 SB9 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI125 SB13 S[13] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI156 VPWR D[9] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI124 Z S[10] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI155 SB9 S[9] 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
-MI154 VPWR D[12] 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
-MI153 net0426 SB12 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI123 net0258 D[10] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI152 SB12 S[12] 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
-MI151 net0434 SB13 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI122 SB10 S[10] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI150 VPWR D[13] 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
-MI149 SB13 S[13] 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
-MI148 net0446 SB10 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI121 SB11 S[11] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI147 SB10 S[10] 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
-MI146 SB11 S[11] 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
-MI145 net0458 SB11 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI120 net0270 D[11] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI144 VPWR D[11] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI119 Z S[11] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI143 VPWR D[10] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI118 Z S[14] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI142 net0470 SB14 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI117 net0282 D[14] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI141 SB14 S[14] 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
-MI140 SB15 S[15] 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
-MI139 net0482 SB15 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI116 SB14 S[14] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI138 VPWR D[15] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI115 SB15 S[15] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI114 net0294 D[15] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI113 Z S[15] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI137 VPWR D[14] 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
+MI35 net99 SB2 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 SB2 S[2] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR D[0] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 net135 SB0 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 SB3 S[3] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net111 SB3 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 VPWR D[3] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 SB0 S[0] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 net123 SB1 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 VPWR D[1] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 SB1 S[1] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 VPWR D[2] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI79 net0165 SB6 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI78 SB6 S[6] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI77 VPWR D[4] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI76 net0177 SB4 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI75 SB7 S[7] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI74 net0185 SB7 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI73 VPWR D[7] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI72 SB4 S[4] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI71 net0197 SB5 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI70 VPWR D[5] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI69 SB5 S[5] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI68 VPWR D[6] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI160 VPWR D[8] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI159 net0402 SB8 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI158 SB8 S[8] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI157 net0410 SB9 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI156 VPWR D[9] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI155 SB9 S[9] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI154 VPWR D[12] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI153 net0426 SB12 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI152 SB12 S[12] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI151 net0434 SB13 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI150 VPWR D[13] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI149 SB13 S[13] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI148 net0446 SB10 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI147 SB10 S[10] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI146 SB11 S[11] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI145 net0458 SB11 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI144 VPWR D[11] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI143 VPWR D[10] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI142 net0470 SB14 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI141 SB14 S[14] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI140 SB15 S[15] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI139 net0482 SB15 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI138 VPWR D[15] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI137 VPWR D[14] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__muxb16to1_1
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.netlist.tsv b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.netlist.tsv
index 090789f..26fc8d9 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.netlist.tsv
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.netlist.tsv
@@ -1,98 +1,98 @@
 sky130_fd_sc_hdll__muxb16to1_1	D[15]:I D[14]:I D[13]:I D[12]:I D[11]:I D[10]:I D[9]:I D[8]:I D[7]:I D[6]:I D[5]:I D[4]:I D[3]:I D[2]:I D[1]:I D[0]:I S[15]:I S[14]:I S[13]:I S[12]:I S[11]:I S[10]:I S[9]:I S[8]:I S[7]:I S[6]:I S[5]:I S[4]:I S[3]:I S[2]:I S[1]:I S[0]: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
-MMNA00	MOSFET	Z	S[0]	net87	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	net87	D[0]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	SB0	S[0]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	Z	S[2]	net51	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net51	D[2]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	SB2	S[2]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	SB3	S[3]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net63	D[3]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Z	S[3]	net63	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Z	S[1]	net75	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net75	D[1]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	SB1	S[1]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI67	MOSFET	Z	S[4]	net073	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI66	MOSFET	net073	D[4]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI65	MOSFET	SB4	S[4]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI64	MOSFET	Z	S[6]	net085	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI63	MOSFET	net085	D[6]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI62	MOSFET	SB6	S[6]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI61	MOSFET	SB7	S[7]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI60	MOSFET	net097	D[7]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI59	MOSFET	Z	S[7]	net097	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI58	MOSFET	Z	S[5]	net0109	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI57	MOSFET	net0109	D[5]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI56	MOSFET	SB5	S[5]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI136	MOSFET	Z	S[8]	net0210	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI135	MOSFET	net0210	D[8]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI134	MOSFET	SB8	S[8]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI133	MOSFET	Z	S[9]	net0222	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI132	MOSFET	net0222	D[9]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI131	MOSFET	SB9	S[9]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI130	MOSFET	Z	S[12]	net0234	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI129	MOSFET	net0234	D[12]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI128	MOSFET	SB12	S[12]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI127	MOSFET	Z	S[13]	net0246	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI126	MOSFET	net0246	D[13]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI125	MOSFET	SB13	S[13]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI124	MOSFET	Z	S[10]	net0258	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI123	MOSFET	net0258	D[10]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI122	MOSFET	SB10	S[10]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI121	MOSFET	SB11	S[11]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI120	MOSFET	net0270	D[11]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI119	MOSFET	Z	S[11]	net0270	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI118	MOSFET	Z	S[14]	net0282	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI117	MOSFET	net0282	D[14]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI116	MOSFET	SB14	S[14]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI115	MOSFET	SB15	S[15]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI114	MOSFET	net0294	D[15]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI113	MOSFET	Z	S[15]	net0294	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI35	MOSFET	net99	SB2	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	SB2	S[2]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	D[0]	net135	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	net135	SB0	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	SB3	S[3]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net111	SB3	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	VPWR	D[3]	net111	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	SB0	S[0]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net123	SB1	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	VPWR	D[1]	net123	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	SB1	S[1]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	VPWR	D[2]	net99	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI79	MOSFET	net0165	SB6	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI78	MOSFET	SB6	S[6]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI77	MOSFET	VPWR	D[4]	net0177	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI76	MOSFET	net0177	SB4	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI75	MOSFET	SB7	S[7]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI74	MOSFET	net0185	SB7	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI73	MOSFET	VPWR	D[7]	net0185	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI72	MOSFET	SB4	S[4]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI71	MOSFET	net0197	SB5	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI70	MOSFET	VPWR	D[5]	net0197	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI69	MOSFET	SB5	S[5]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI68	MOSFET	VPWR	D[6]	net0165	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI160	MOSFET	VPWR	D[8]	net0402	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI159	MOSFET	net0402	SB8	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI158	MOSFET	SB8	S[8]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI157	MOSFET	net0410	SB9	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI156	MOSFET	VPWR	D[9]	net0410	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI155	MOSFET	SB9	S[9]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI154	MOSFET	VPWR	D[12]	net0426	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI153	MOSFET	net0426	SB12	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI152	MOSFET	SB12	S[12]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI151	MOSFET	net0434	SB13	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI150	MOSFET	VPWR	D[13]	net0434	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI149	MOSFET	SB13	S[13]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI148	MOSFET	net0446	SB10	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI147	MOSFET	SB10	S[10]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI146	MOSFET	SB11	S[11]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI145	MOSFET	net0458	SB11	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI144	MOSFET	VPWR	D[11]	net0458	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI143	MOSFET	VPWR	D[10]	net0446	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI142	MOSFET	net0470	SB14	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI141	MOSFET	SB14	S[14]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI140	MOSFET	SB15	S[15]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI139	MOSFET	net0482	SB15	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI138	MOSFET	VPWR	D[15]	net0482	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI137	MOSFET	VPWR	D[14]	net0470	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Z	S[0]	net87	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	net87	D[0]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	SB0	S[0]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	Z	S[2]	net51	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net51	D[2]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	SB2	S[2]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	SB3	S[3]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net63	D[3]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Z	S[3]	net63	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Z	S[1]	net75	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net75	D[1]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	SB1	S[1]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI67	MOSFET	Z	S[4]	net073	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI66	MOSFET	net073	D[4]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI65	MOSFET	SB4	S[4]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI64	MOSFET	Z	S[6]	net085	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI63	MOSFET	net085	D[6]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI62	MOSFET	SB6	S[6]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI61	MOSFET	SB7	S[7]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI60	MOSFET	net097	D[7]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI59	MOSFET	Z	S[7]	net097	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI58	MOSFET	Z	S[5]	net0109	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI57	MOSFET	net0109	D[5]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI56	MOSFET	SB5	S[5]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI136	MOSFET	Z	S[8]	net0210	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI135	MOSFET	net0210	D[8]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI134	MOSFET	SB8	S[8]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI133	MOSFET	Z	S[9]	net0222	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI132	MOSFET	net0222	D[9]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI131	MOSFET	SB9	S[9]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI130	MOSFET	Z	S[12]	net0234	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI129	MOSFET	net0234	D[12]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI128	MOSFET	SB12	S[12]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI127	MOSFET	Z	S[13]	net0246	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI126	MOSFET	net0246	D[13]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI125	MOSFET	SB13	S[13]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI124	MOSFET	Z	S[10]	net0258	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI123	MOSFET	net0258	D[10]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI122	MOSFET	SB10	S[10]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI121	MOSFET	SB11	S[11]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI120	MOSFET	net0270	D[11]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI119	MOSFET	Z	S[11]	net0270	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI118	MOSFET	Z	S[14]	net0282	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI117	MOSFET	net0282	D[14]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI116	MOSFET	SB14	S[14]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI115	MOSFET	SB15	S[15]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI114	MOSFET	net0294	D[15]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI113	MOSFET	Z	S[15]	net0294	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI35	MOSFET	net99	SB2	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	SB2	S[2]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	D[0]	net135	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	net135	SB0	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	SB3	S[3]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net111	SB3	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	VPWR	D[3]	net111	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	SB0	S[0]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net123	SB1	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	VPWR	D[1]	net123	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	SB1	S[1]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	VPWR	D[2]	net99	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI79	MOSFET	net0165	SB6	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI78	MOSFET	SB6	S[6]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI77	MOSFET	VPWR	D[4]	net0177	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI76	MOSFET	net0177	SB4	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI75	MOSFET	SB7	S[7]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI74	MOSFET	net0185	SB7	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI73	MOSFET	VPWR	D[7]	net0185	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI72	MOSFET	SB4	S[4]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI71	MOSFET	net0197	SB5	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI70	MOSFET	VPWR	D[5]	net0197	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI69	MOSFET	SB5	S[5]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI68	MOSFET	VPWR	D[6]	net0165	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI160	MOSFET	VPWR	D[8]	net0402	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI159	MOSFET	net0402	SB8	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI158	MOSFET	SB8	S[8]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI157	MOSFET	net0410	SB9	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI156	MOSFET	VPWR	D[9]	net0410	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI155	MOSFET	SB9	S[9]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI154	MOSFET	VPWR	D[12]	net0426	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI153	MOSFET	net0426	SB12	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI152	MOSFET	SB12	S[12]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI151	MOSFET	net0434	SB13	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI150	MOSFET	VPWR	D[13]	net0434	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI149	MOSFET	SB13	S[13]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI148	MOSFET	net0446	SB10	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI147	MOSFET	SB10	S[10]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI146	MOSFET	SB11	S[11]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI145	MOSFET	net0458	SB11	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI144	MOSFET	VPWR	D[11]	net0458	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI143	MOSFET	VPWR	D[10]	net0446	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI142	MOSFET	net0470	SB14	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI141	MOSFET	SB14	S[14]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI140	MOSFET	SB15	S[15]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI139	MOSFET	net0482	SB15	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI138	MOSFET	VPWR	D[15]	net0482	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI137	MOSFET	VPWR	D[14]	net0470	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.spice b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.spice
index 127a4af..45715e4 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.spice
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.spice
@@ -18,196 +18,100 @@
 .subckt sky130_fd_sc_hdll__muxb16to1_1 D[15] D[14] D[13] D[12] D[11] D[10] D[9] D[8]
 + D[7] D[6] D[5] D[4] D[3] D[2] D[1] D[0] S[15] S[14] S[13] S[12] S[11] S[10] S[9]
 + S[8] S[7] S[6] S[5] S[4] S[3] S[2] S[1] S[0] VGND VNB VPB VPWR Z
-M1000 Z a_1012_793# a_945_591# VPB phighvt w=820000u l=180000u
-+  ad=3.5424e+12p pd=3.488e+07u as=3.297e+11p ps=2.69e+06u
-M1001 a_1765_47# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=3.7518e+12p ps=3.424e+07u
-M1002 a_937_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1003 a_2593_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1004 Z a_2668_793# a_2601_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=3.297e+11p ps=2.69e+06u
-M1005 a_1773_297# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=6.38e+12p ps=4.876e+07u
-M1006 a_1773_591# D[12] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1007 VGND S[6] a_2668_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1008 a_2390_591# a_2189_937# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1009 a_1361_47# S[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1010 VPWR D[7] a_3218_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.297e+11p ps=2.69e+06u
-M1011 a_937_911# D[10] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1012 a_1361_937# S[11] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1013 VPWR D[15] a_3218_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.297e+11p ps=2.69e+06u
-M1014 Z a_1840_265# a_1773_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1574_47# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=2.1632e+12p ps=2.496e+07u
-M1016 a_2402_937# S[13] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1017 a_734_333# a_533_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1018 Z S[2] a_937_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_3017_47# S[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1020 a_2402_47# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1021 a_3017_937# S[15] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1022 a_1562_333# a_1361_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1023 a_746_47# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1024 VGND S[12] a_1840_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1025 a_109_911# D[8] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1026 VGND S[14] a_2668_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1027 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1028 VPWR D[3] a_1562_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_2601_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1030 Z S[4] a_1765_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_533_937# S[9] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1032 a_117_591# D[8] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1033 VPWR D[11] a_1562_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.297e+11p ps=2.69e+06u
-M1034 VGND D[15] a_3230_937# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.95e+06u
-M1035 a_2601_591# D[14] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Z a_184_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1765_911# D[12] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1038 a_3218_591# a_3017_937# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_533_47# S[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1040 a_945_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1041 Z a_1012_265# a_945_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_533_937# S[9] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1043 VGND D[11] a_1574_937# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.95e+06u
-M1044 a_945_591# D[10] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VPWR S[0] a_184_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1046 a_2189_47# S[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1047 a_746_937# S[9] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1048 VPWR S[8] a_184_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1049 a_2189_937# S[13] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1050 VPWR S[2] a_1012_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1051 Z a_2668_265# a_2601_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 a_1361_47# S[3] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1053 VPWR S[10] a_1012_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1054 a_3230_937# S[15] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 a_533_47# S[1] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1056 Z S[8] a_109_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 VGND D[9] a_746_937# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 VGND S[0] a_184_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1059 a_2390_333# a_2189_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1060 a_3230_47# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1061 a_1361_937# S[11] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1062 VGND D[1] a_746_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 Z S[6] a_2593_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 Z a_1840_793# a_1773_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 Z S[10] a_937_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 VPWR S[6] a_2668_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1067 VGND S[8] a_184_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1068 a_1574_937# S[11] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 Z S[12] a_1765_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 a_2189_937# S[13] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1071 a_734_591# a_533_937# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1072 VPWR S[14] a_2668_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1073 a_3017_937# S[15] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1074 a_1562_591# a_1361_937# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1075 VPWR D[1] a_734_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1076 VPWR D[9] a_734_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 VPWR D[5] a_2390_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1078 a_2189_47# S[5] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1079 VPWR D[13] a_2390_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1080 VPWR S[4] a_1840_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1081 VGND D[3] a_1574_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1082 VGND S[10] a_1012_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1083 a_2593_911# D[14] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1084 Z S[14] a_2593_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1085 VPWR S[12] a_1840_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1086 a_109_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1087 VGND D[5] a_2402_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1088 VGND S[2] a_1012_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1089 VGND D[7] a_3230_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1090 Z a_184_793# a_117_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1091 VGND D[13] a_2402_937# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1092 Z S[0] a_109_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1093 a_3218_333# a_3017_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1094 VGND S[4] a_1840_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1095 a_3017_47# S[7] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
+X0 VGND S[11] a_1361_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X1 VPWR D[8] a_117_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VPWR S[1] a_533_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_109_911# S[8] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X4 VGND D[2] a_937_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_1840_265# S[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_1012_265# S[2] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X7 VGND D[4] a_1765_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_3218_333# D[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND D[10] a_937_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_2402_47# D[5] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VGND S[7] a_3017_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X12 VPWR S[13] a_2189_937# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VPWR D[4] a_1773_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 VPWR D[10] a_945_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VPWR S[15] a_3017_937# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 Z S[7] a_3230_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X17 a_937_911# S[10] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X18 a_2390_333# D[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_1574_47# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_1765_47# S[4] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X21 a_1012_265# S[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 a_1765_911# S[12] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X23 VPWR S[11] a_1361_937# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 VPWR D[0] a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 a_109_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X26 VGND S[13] a_2189_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X27 Z a_3017_937# a_3218_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X28 a_2593_47# S[6] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X29 VGND S[9] a_533_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X30 a_117_591# a_184_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X31 Z a_533_937# a_734_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X32 VGND S[15] a_3017_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X33 a_1562_591# D[11] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X34 VPWR D[2] a_945_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 VPWR S[5] a_2189_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X36 a_2668_265# S[6] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X37 Z S[13] a_2402_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X38 VPWR S[7] a_3017_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X39 VGND D[8] a_109_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X40 a_3230_937# D[15] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X41 Z a_2189_937# a_2390_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X42 a_2601_591# a_2668_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X43 VPWR S[3] a_1361_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X44 Z a_3017_47# a_3218_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X45 Z S[11] a_1574_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X46 a_117_297# a_184_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X47 Z a_533_47# a_734_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X48 a_184_265# S[0] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X49 VGND S[3] a_1361_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X50 a_1840_793# S[12] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X51 VGND D[14] a_2593_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X52 a_2593_911# S[14] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X53 VGND S[1] a_533_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X54 a_184_793# S[8] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X55 a_2402_937# D[13] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X56 a_2668_793# S[14] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X57 a_734_591# D[9] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X58 a_945_591# a_1012_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X59 a_2668_793# S[14] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X60 Z a_1361_937# a_1562_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X61 a_1562_333# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X62 a_1773_591# a_1840_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X63 Z a_2189_47# a_2390_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X64 VGND S[5] a_2189_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X65 a_746_937# D[9] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X66 a_2601_297# a_2668_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X67 a_1012_793# S[10] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X68 a_184_793# S[8] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X69 VGND D[12] a_1765_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X70 Z S[15] a_3230_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X71 Z S[5] a_2402_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X72 a_1574_937# D[11] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X73 VPWR D[14] a_2601_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X74 a_945_297# a_1012_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X75 VGND D[0] a_109_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X76 Z a_1361_47# a_1562_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X77 a_937_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X78 VPWR S[9] a_533_937# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X79 a_3218_591# D[15] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X80 a_1773_297# a_1840_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X81 Z S[3] a_1574_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X82 a_2668_265# S[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X83 a_1840_793# S[12] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X84 Z S[1] a_746_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X85 VPWR D[12] a_1773_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X86 a_734_333# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X87 Z S[9] a_746_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X88 a_2390_591# D[13] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X89 VGND D[6] a_2593_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X90 a_1012_793# S[10] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X91 a_184_265# S[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X92 a_746_47# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X93 a_1840_265# S[4] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X94 a_3230_47# D[7] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X95 VPWR D[6] a_2601_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.cdl b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.cdl
index cf24f53..ee93f72 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.cdl
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.cdl
@@ -20,196 +20,196 @@
 *.PININFO D[0]:I S[15]:I S[14]:I S[13]:I S[12]:I S[11]:I S[10]:I
 *.PININFO S[9]:I S[8]:I S[7]:I S[6]:I S[5]:I S[4]:I S[3]:I S[2]:I
 *.PININFO S[1]:I S[0]:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMNA00 Z S[0] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Z S[0] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 net87 D[0] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA01 net87 D[0] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 SB0 S[0] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 Z S[2] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net51 D[2] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 SB2 S[2] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 SB3 S[3] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 net63 D[3] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Z S[3] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Z S[1] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net75 D[1] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 SB1 S[1] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI67 Z S[4] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI66 net073 D[4] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI65 SB4 S[4] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI64 Z S[6] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI63 net085 D[6] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI62 SB6 S[6] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI61 SB7 S[7] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI60 net097 D[7] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI59 Z S[7] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI58 Z S[5] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI57 net0109 D[5] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN1 SB0 S[0] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI56 SB5 S[5] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI30 Z S[2] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI136 Z S[8] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI135 net0210 D[8] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI29 net51 D[2] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI134 SB8 S[8] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI28 SB2 S[2] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI133 Z S[9] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI27 SB3 S[3] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI132 net0222 D[9] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI26 net63 D[3] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI131 SB9 S[9] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI25 Z S[3] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI130 Z S[12] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI13 Z S[1] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI129 net0234 D[12] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI12 net75 D[1] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI128 SB12 S[12] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 SB1 S[1] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI127 Z S[13] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI67 Z S[4] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI126 net0246 D[13] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI66 net073 D[4] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI125 SB13 S[13] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI65 SB4 S[4] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI124 Z S[10] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI64 Z S[6] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI123 net0258 D[10] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI63 net085 D[6] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI122 SB10 S[10] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI62 SB6 S[6] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI121 SB11 S[11] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI61 SB7 S[7] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI120 net0270 D[11] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI60 net097 D[7] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI119 Z S[11] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI59 Z S[7] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI118 Z S[14] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI58 Z S[5] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI117 net0282 D[14] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI57 net0109 D[5] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI116 SB14 S[14] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI56 SB5 S[5] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI115 SB15 S[15] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI136 Z S[8] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI114 net0294 D[15] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI135 net0210 D[8] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI113 Z S[15] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 net99 SB2 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 SB2 S[2] 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
-MMPA00 VPWR D[0] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 net135 SB0 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI134 SB8 S[8] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 SB3 S[3] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI133 Z S[9] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net111 SB3 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 VPWR D[3] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 SB0 S[0] 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
-MI15 net123 SB1 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 VPWR D[1] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 SB1 S[1] VPB 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
-MI36 VPWR D[2] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI79 net0165 SB6 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI132 net0222 D[9] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI78 SB6 S[6] VPB 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
-MI77 VPWR D[4] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI76 net0177 SB4 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI131 SB9 S[9] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI75 SB7 S[7] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI130 Z S[12] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI74 net0185 SB7 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI129 net0234 D[12] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI73 VPWR D[7] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI72 SB4 S[4] VPB 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
-MI71 net0197 SB5 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI128 SB12 S[12] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI70 VPWR D[5] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI127 Z S[13] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI69 SB5 S[5] 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
-MI68 VPWR D[6] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI160 VPWR D[8] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI159 net0402 SB8 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI126 net0246 D[13] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI158 SB8 S[8] 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
-MI157 net0410 SB9 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI125 SB13 S[13] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI156 VPWR D[9] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI124 Z S[10] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI155 SB9 S[9] 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
-MI154 VPWR D[12] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI153 net0426 SB12 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI123 net0258 D[10] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI152 SB12 S[12] 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
-MI151 net0434 SB13 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI122 SB10 S[10] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI150 VPWR D[13] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI149 SB13 S[13] 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
-MI148 net0446 SB10 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI121 SB11 S[11] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI147 SB10 S[10] 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
-MI146 SB11 S[11] 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
-MI145 net0458 SB11 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI120 net0270 D[11] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI144 VPWR D[11] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI119 Z S[11] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI143 VPWR D[10] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI118 Z S[14] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI142 net0470 SB14 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI117 net0282 D[14] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI141 SB14 S[14] 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
-MI140 SB15 S[15] 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
-MI139 net0482 SB15 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI116 SB14 S[14] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI138 VPWR D[15] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI115 SB15 S[15] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI114 net0294 D[15] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI113 Z S[15] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI137 VPWR D[14] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI35 net99 SB2 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 SB2 S[2] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR D[0] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 net135 SB0 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 SB3 S[3] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net111 SB3 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 VPWR D[3] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 SB0 S[0] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 net123 SB1 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 VPWR D[1] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 SB1 S[1] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 VPWR D[2] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI79 net0165 SB6 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI78 SB6 S[6] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI77 VPWR D[4] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI76 net0177 SB4 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI75 SB7 S[7] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI74 net0185 SB7 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI73 VPWR D[7] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI72 SB4 S[4] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI71 net0197 SB5 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI70 VPWR D[5] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI69 SB5 S[5] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI68 VPWR D[6] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI160 VPWR D[8] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI159 net0402 SB8 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI158 SB8 S[8] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI157 net0410 SB9 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI156 VPWR D[9] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI155 SB9 S[9] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI154 VPWR D[12] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI153 net0426 SB12 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI152 SB12 S[12] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI151 net0434 SB13 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI150 VPWR D[13] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI149 SB13 S[13] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI148 net0446 SB10 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI147 SB10 S[10] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI146 SB11 S[11] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI145 net0458 SB11 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI144 VPWR D[11] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI143 VPWR D[10] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI142 net0470 SB14 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI141 SB14 S[14] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI140 SB15 S[15] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI139 net0482 SB15 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI138 VPWR D[15] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI137 VPWR D[14] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__muxb16to1_2
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.netlist.tsv b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.netlist.tsv
index 9608592..d2b09d8 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.netlist.tsv
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.netlist.tsv
@@ -1,98 +1,98 @@
 sky130_fd_sc_hdll__muxb16to1_2	D[15]:I D[14]:I D[13]:I D[12]:I D[11]:I D[10]:I D[9]:I D[8]:I D[7]:I D[6]:I D[5]:I D[4]:I D[3]:I D[2]:I D[1]:I D[0]:I S[15]:I S[14]:I S[13]:I S[12]:I S[11]:I S[10]:I S[9]:I S[8]:I S[7]:I S[6]:I S[5]:I S[4]:I S[3]:I S[2]:I S[1]:I S[0]: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
-MMNA00	MOSFET	Z	S[0]	net87	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	net87	D[0]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	SB0	S[0]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	Z	S[2]	net51	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net51	D[2]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	SB2	S[2]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	SB3	S[3]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net63	D[3]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Z	S[3]	net63	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Z	S[1]	net75	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net75	D[1]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	SB1	S[1]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI67	MOSFET	Z	S[4]	net073	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI66	MOSFET	net073	D[4]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI65	MOSFET	SB4	S[4]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI64	MOSFET	Z	S[6]	net085	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI63	MOSFET	net085	D[6]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI62	MOSFET	SB6	S[6]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI61	MOSFET	SB7	S[7]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI60	MOSFET	net097	D[7]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI59	MOSFET	Z	S[7]	net097	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI58	MOSFET	Z	S[5]	net0109	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI57	MOSFET	net0109	D[5]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI56	MOSFET	SB5	S[5]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI136	MOSFET	Z	S[8]	net0210	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI135	MOSFET	net0210	D[8]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI134	MOSFET	SB8	S[8]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI133	MOSFET	Z	S[9]	net0222	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI132	MOSFET	net0222	D[9]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI131	MOSFET	SB9	S[9]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI130	MOSFET	Z	S[12]	net0234	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI129	MOSFET	net0234	D[12]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI128	MOSFET	SB12	S[12]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI127	MOSFET	Z	S[13]	net0246	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI126	MOSFET	net0246	D[13]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI125	MOSFET	SB13	S[13]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI124	MOSFET	Z	S[10]	net0258	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI123	MOSFET	net0258	D[10]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI122	MOSFET	SB10	S[10]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI121	MOSFET	SB11	S[11]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI120	MOSFET	net0270	D[11]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI119	MOSFET	Z	S[11]	net0270	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI118	MOSFET	Z	S[14]	net0282	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI117	MOSFET	net0282	D[14]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI116	MOSFET	SB14	S[14]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI115	MOSFET	SB15	S[15]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI114	MOSFET	net0294	D[15]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI113	MOSFET	Z	S[15]	net0294	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI35	MOSFET	net99	SB2	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	SB2	S[2]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	D[0]	net135	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	net135	SB0	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	SB3	S[3]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net111	SB3	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	VPWR	D[3]	net111	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	SB0	S[0]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net123	SB1	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	VPWR	D[1]	net123	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	SB1	S[1]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	VPWR	D[2]	net99	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI79	MOSFET	net0165	SB6	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI78	MOSFET	SB6	S[6]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI77	MOSFET	VPWR	D[4]	net0177	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI76	MOSFET	net0177	SB4	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI75	MOSFET	SB7	S[7]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI74	MOSFET	net0185	SB7	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI73	MOSFET	VPWR	D[7]	net0185	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI72	MOSFET	SB4	S[4]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI71	MOSFET	net0197	SB5	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI70	MOSFET	VPWR	D[5]	net0197	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI69	MOSFET	SB5	S[5]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI68	MOSFET	VPWR	D[6]	net0165	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI160	MOSFET	VPWR	D[8]	net0402	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI159	MOSFET	net0402	SB8	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI158	MOSFET	SB8	S[8]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI157	MOSFET	net0410	SB9	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI156	MOSFET	VPWR	D[9]	net0410	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI155	MOSFET	SB9	S[9]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI154	MOSFET	VPWR	D[12]	net0426	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI153	MOSFET	net0426	SB12	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI152	MOSFET	SB12	S[12]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI151	MOSFET	net0434	SB13	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI150	MOSFET	VPWR	D[13]	net0434	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI149	MOSFET	SB13	S[13]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI148	MOSFET	net0446	SB10	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI147	MOSFET	SB10	S[10]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI146	MOSFET	SB11	S[11]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI145	MOSFET	net0458	SB11	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI144	MOSFET	VPWR	D[11]	net0458	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI143	MOSFET	VPWR	D[10]	net0446	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI142	MOSFET	net0470	SB14	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI141	MOSFET	SB14	S[14]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI140	MOSFET	SB15	S[15]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI139	MOSFET	net0482	SB15	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI138	MOSFET	VPWR	D[15]	net0482	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI137	MOSFET	VPWR	D[14]	net0470	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Z	S[0]	net87	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	net87	D[0]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	SB0	S[0]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	Z	S[2]	net51	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net51	D[2]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	SB2	S[2]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	SB3	S[3]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net63	D[3]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Z	S[3]	net63	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Z	S[1]	net75	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net75	D[1]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	SB1	S[1]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI67	MOSFET	Z	S[4]	net073	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI66	MOSFET	net073	D[4]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI65	MOSFET	SB4	S[4]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI64	MOSFET	Z	S[6]	net085	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI63	MOSFET	net085	D[6]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI62	MOSFET	SB6	S[6]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI61	MOSFET	SB7	S[7]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI60	MOSFET	net097	D[7]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI59	MOSFET	Z	S[7]	net097	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI58	MOSFET	Z	S[5]	net0109	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI57	MOSFET	net0109	D[5]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI56	MOSFET	SB5	S[5]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI136	MOSFET	Z	S[8]	net0210	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI135	MOSFET	net0210	D[8]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI134	MOSFET	SB8	S[8]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI133	MOSFET	Z	S[9]	net0222	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI132	MOSFET	net0222	D[9]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI131	MOSFET	SB9	S[9]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI130	MOSFET	Z	S[12]	net0234	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI129	MOSFET	net0234	D[12]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI128	MOSFET	SB12	S[12]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI127	MOSFET	Z	S[13]	net0246	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI126	MOSFET	net0246	D[13]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI125	MOSFET	SB13	S[13]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI124	MOSFET	Z	S[10]	net0258	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI123	MOSFET	net0258	D[10]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI122	MOSFET	SB10	S[10]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI121	MOSFET	SB11	S[11]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI120	MOSFET	net0270	D[11]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI119	MOSFET	Z	S[11]	net0270	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI118	MOSFET	Z	S[14]	net0282	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI117	MOSFET	net0282	D[14]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI116	MOSFET	SB14	S[14]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI115	MOSFET	SB15	S[15]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI114	MOSFET	net0294	D[15]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI113	MOSFET	Z	S[15]	net0294	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI35	MOSFET	net99	SB2	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	SB2	S[2]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	D[0]	net135	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	net135	SB0	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	SB3	S[3]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net111	SB3	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	VPWR	D[3]	net111	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	SB0	S[0]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net123	SB1	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	VPWR	D[1]	net123	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	SB1	S[1]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	VPWR	D[2]	net99	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI79	MOSFET	net0165	SB6	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI78	MOSFET	SB6	S[6]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI77	MOSFET	VPWR	D[4]	net0177	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI76	MOSFET	net0177	SB4	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI75	MOSFET	SB7	S[7]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI74	MOSFET	net0185	SB7	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI73	MOSFET	VPWR	D[7]	net0185	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI72	MOSFET	SB4	S[4]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI71	MOSFET	net0197	SB5	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI70	MOSFET	VPWR	D[5]	net0197	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI69	MOSFET	SB5	S[5]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI68	MOSFET	VPWR	D[6]	net0165	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI160	MOSFET	VPWR	D[8]	net0402	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI159	MOSFET	net0402	SB8	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI158	MOSFET	SB8	S[8]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI157	MOSFET	net0410	SB9	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI156	MOSFET	VPWR	D[9]	net0410	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI155	MOSFET	SB9	S[9]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI154	MOSFET	VPWR	D[12]	net0426	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI153	MOSFET	net0426	SB12	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI152	MOSFET	SB12	S[12]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI151	MOSFET	net0434	SB13	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI150	MOSFET	VPWR	D[13]	net0434	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI149	MOSFET	SB13	S[13]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI148	MOSFET	net0446	SB10	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI147	MOSFET	SB10	S[10]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI146	MOSFET	SB11	S[11]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI145	MOSFET	net0458	SB11	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI144	MOSFET	VPWR	D[11]	net0458	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI143	MOSFET	VPWR	D[10]	net0446	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI142	MOSFET	net0470	SB14	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI141	MOSFET	SB14	S[14]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI140	MOSFET	SB15	S[15]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI139	MOSFET	net0482	SB15	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI138	MOSFET	VPWR	D[15]	net0482	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI137	MOSFET	VPWR	D[14]	net0470	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.spice b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.spice
index 7916da8..b0b4701 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.spice
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.spice
@@ -18,324 +18,164 @@
 .subckt sky130_fd_sc_hdll__muxb16to1_2 D[15] D[14] D[13] D[12] D[11] D[10] D[9] D[8]
 + D[7] D[6] D[5] D[4] D[3] D[2] D[1] D[0] S[15] S[14] S[13] S[12] S[11] S[10] S[9]
 + S[8] S[7] S[6] S[5] S[4] S[3] S[2] S[1] S[0] VGND VNB VPB VPWR Z
-M1000 a_2603_911# S[12] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=2.2464e+12p ps=2.528e+07u
-M1001 VPWR S[4] a_2854_265# VPB phighvt w=1e+06u l=180000u
-+  ad=7.52e+12p pd=6.304e+07u as=2.7e+11p ps=2.54e+06u
-M1002 VPWR D[3] a_2112_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1003 VPWR D[2] a_1315_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1004 Z a_1989_47# a_2112_333# VPB phighvt w=820000u l=180000u
-+  ad=3.8048e+12p pd=3.552e+07u as=0p ps=0u
-M1005 Z a_1566_265# a_1315_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Z a_4142_793# a_3891_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1007 VPWR S[12] a_2854_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1008 VPWR D[11] a_2112_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1009 VPWR D[10] a_1315_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1010 a_27_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1011 a_2133_915# D[11] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=3.9312e+12p ps=4.208e+07u
-M1012 VGND S[14] a_4142_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1013 a_27_297# a_278_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_591# D[8] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1015 Z S[10] a_1315_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1016 a_3421_915# S[13] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1017 a_4565_47# S[7] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1018 VGND D[14] a_3891_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1019 a_1989_47# S[3] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1020 a_27_911# S[8] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1021 a_3891_911# S[14] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Z S[5] a_3421_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1023 VPWR S[0] a_278_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1024 a_4709_69# D[7] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1025 a_2133_69# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1026 VGND D[9] a_845_915# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1027 VPWR S[8] a_278_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1028 a_845_69# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1029 Z S[11] a_2133_915# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_2603_297# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1031 Z a_278_265# a_27_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_27_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1033 VGND S[10] a_1566_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1034 a_2603_297# a_2854_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1315_911# D[10] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Z a_701_937# a_824_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1037 Z S[1] a_845_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_2603_591# D[12] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1039 a_701_937# S[9] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1040 a_4565_937# S[15] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1041 Z S[0] a_27_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_27_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_1315_911# S[10] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_1315_591# a_1566_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_2112_591# a_1989_937# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 Z S[4] a_2603_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1047 VGND D[8] a_27_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 Z S[9] a_845_915# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 a_4688_591# a_4565_937# Z VPB phighvt w=820000u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1050 VGND D[7] a_4709_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 a_3400_333# D[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1052 a_824_333# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1053 a_1989_47# S[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1054 a_3421_69# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 a_3400_333# a_3277_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 a_824_591# D[9] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 VGND D[4] a_2603_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 a_3400_591# D[13] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1059 a_845_915# D[9] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 a_1989_937# S[11] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1061 a_4688_333# D[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1062 a_3891_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1063 VGND S[12] a_2854_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1064 VGND S[4] a_2854_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1065 a_3277_47# S[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1066 a_3891_297# a_4142_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1067 a_2133_915# S[11] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1068 a_4688_591# D[15] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 a_3891_591# D[14] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 a_3277_937# S[13] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1071 a_1989_937# S[11] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1072 a_701_47# S[1] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1073 VGND D[12] a_2603_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1074 VGND D[1] a_845_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1075 VPWR D[0] a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1076 Z a_4565_937# a_4688_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 VPWR S[6] a_4142_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1078 VPWR D[8] a_27_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1079 VPWR D[5] a_3400_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1080 VPWR D[4] a_2603_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1081 VGND S[0] a_278_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1082 Z a_3277_47# a_3400_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1083 Z a_2854_265# a_2603_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1084 a_824_333# a_701_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1085 VPWR S[14] a_4142_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1086 a_2603_47# S[4] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1087 VPWR D[13] a_3400_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1088 VPWR D[12] a_2603_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1089 a_701_47# S[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1090 VGND D[5] a_3421_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1091 Z a_4142_265# a_3891_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1092 a_701_937# S[9] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1093 Z a_1989_937# a_2112_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1094 a_2603_47# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1095 Z a_1566_793# a_1315_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1096 a_3277_937# S[13] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1097 VPWR D[1] a_824_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1098 a_3277_47# S[5] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1099 a_27_591# a_278_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1100 VGND D[13] a_3421_915# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1101 VPWR D[9] a_824_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1102 Z S[3] a_2133_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1103 a_2603_911# D[12] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1104 Z S[8] a_27_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1105 a_845_69# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1106 Z S[15] a_4709_915# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1107 Z S[7] a_4709_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1108 VGND D[0] a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1109 VGND D[10] a_1315_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1110 a_3421_69# D[5] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1111 Z a_278_793# a_27_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1112 Z S[6] a_3891_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1113 Z a_701_47# a_824_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1114 a_2603_591# a_2854_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1115 VGND S[8] a_278_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1116 Z S[2] a_1315_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1117 a_1315_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1118 a_27_911# D[8] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1119 a_3891_911# D[14] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1120 a_1315_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1121 a_3421_915# D[13] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1122 a_4688_333# a_4565_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1123 a_2112_333# a_1989_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1124 a_1315_297# a_1566_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1125 a_2133_69# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1126 a_1315_591# D[10] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1127 VGND D[2] a_1315_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1128 Z S[12] a_2603_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1129 a_4565_47# S[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1130 a_845_915# S[9] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1131 a_4709_915# S[15] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1132 a_4565_937# S[15] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1133 VPWR S[2] a_1566_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1134 a_3400_591# a_3277_937# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1135 a_2112_333# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1136 VGND D[11] a_2133_915# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1137 VPWR S[10] a_1566_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1138 a_4709_69# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1139 VGND D[6] a_3891_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1140 a_3891_591# a_4142_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1141 a_2112_591# D[11] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1142 VPWR D[7] a_4688_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1143 VPWR D[6] a_3891_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1144 VGND S[6] a_4142_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1145 a_3891_47# S[6] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1146 Z S[13] a_3421_915# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1147 a_4709_915# D[15] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1148 Z a_4565_47# a_4688_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1149 VPWR D[15] a_4688_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1150 VGND S[2] a_1566_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1151 a_1315_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1152 VPWR D[14] a_3891_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1153 Z S[14] a_3891_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1154 VGND D[15] a_4709_915# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1155 a_3891_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1156 VGND D[3] a_2133_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1157 a_824_591# a_701_937# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1158 Z a_3277_937# a_3400_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1159 Z a_2854_793# a_2603_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_591# D[8] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_1315_47# D[2] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_3421_915# D[13] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_2603_47# D[4] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_3891_47# D[6] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_4709_915# S[15] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X6 a_2112_333# a_1989_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X7 VGND S[13] a_3277_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X8 a_1566_793# S[10] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_3891_47# S[6] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X10 VPWR D[5] a_3400_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 Z a_4142_793# a_3891_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X12 a_27_911# D[8] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VGND D[15] a_4709_915# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 Z a_278_265# a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X15 VGND S[11] a_1989_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X16 Z S[0] a_27_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X17 a_4688_591# D[15] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VGND D[13] a_3421_915# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 Z S[15] a_4709_915# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X20 a_845_69# S[1] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X21 a_4142_793# S[14] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X22 VPWR D[3] a_2112_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 a_1315_911# D[10] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 VPWR S[9] a_701_937# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 Z a_701_937# a_824_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X26 a_3400_591# D[13] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 a_3891_591# D[14] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 VPWR D[12] a_2603_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 a_1315_911# S[10] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X30 a_27_911# S[8] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X31 a_27_297# D[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 VGND D[1] a_845_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X33 Z a_4142_265# a_3891_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X34 a_824_591# a_701_937# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X35 VGND D[3] a_2133_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X36 VGND D[5] a_3421_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X37 VGND S[15] a_4565_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X38 a_27_591# a_278_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X39 a_2112_591# D[11] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X40 a_278_793# S[8] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X41 a_2603_591# D[12] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X42 VPWR D[9] a_824_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X43 VPWR D[10] a_1315_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X44 VGND S[5] a_3277_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X45 a_1566_265# S[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X46 VGND S[7] a_4565_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X47 Z S[10] a_1315_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X48 VPWR S[15] a_4565_937# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X49 a_4688_333# D[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X50 Z a_4565_937# a_4688_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X51 VGND D[6] a_3891_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X52 Z a_701_47# a_824_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X53 a_824_591# D[9] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X54 a_1315_591# D[10] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X55 a_2603_911# D[12] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X56 a_845_69# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X57 a_2133_69# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X58 a_3421_69# D[5] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X59 a_3891_911# S[14] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X60 a_824_333# a_701_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X61 VPWR S[1] a_701_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X62 a_2603_911# S[12] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X63 Z S[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X64 a_3891_297# D[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X65 a_3400_333# D[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X66 a_3891_591# a_4142_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X67 Z a_3277_937# a_3400_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X68 VPWR S[13] a_3277_937# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X69 a_2854_265# S[4] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X70 Z S[4] a_2603_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X71 a_27_297# a_278_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X72 a_4142_793# S[14] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X73 a_4142_265# S[6] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X74 VPWR D[4] a_2603_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X75 VGND D[14] a_3891_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X76 a_27_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X77 VGND S[1] a_701_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X78 VGND D[12] a_2603_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X79 Z S[9] a_845_915# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X80 Z a_4565_47# a_4688_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X81 VPWR D[8] a_27_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X82 Z S[14] a_3891_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X83 a_2112_333# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X84 a_278_265# S[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X85 VGND D[0] a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X86 a_2603_297# D[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X87 a_2854_793# S[12] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X88 VPWR D[1] a_824_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X89 Z S[12] a_2603_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X90 VPWR D[2] a_1315_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X91 a_1315_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X92 a_2603_47# S[4] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X93 a_3891_911# D[14] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X94 Z S[3] a_2133_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X95 VPWR S[7] a_4565_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X96 a_27_47# D[0] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X97 Z S[5] a_3421_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X98 VPWR D[15] a_4688_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X99 a_845_915# D[9] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X100 Z S[7] a_4709_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X101 a_3891_297# a_4142_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X102 Z a_3277_47# a_3400_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X103 a_2133_915# S[11] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X104 a_824_333# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X105 a_1315_297# D[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X106 Z a_2854_793# a_2603_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X107 VGND D[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X108 a_4709_69# D[7] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X109 a_4709_915# D[15] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X110 VGND S[9] a_701_937# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X111 VPWR S[5] a_3277_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X112 VPWR S[11] a_1989_937# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X113 a_4142_265# S[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X114 VPWR D[14] a_3891_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X115 a_2603_591# a_2854_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X116 a_4688_591# a_4565_937# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X117 VGND D[9] a_845_915# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X118 a_2133_69# S[3] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X119 Z a_1566_793# a_1315_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X120 a_3421_69# S[5] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X121 Z S[11] a_2133_915# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X122 a_4709_69# S[7] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X123 VGND D[7] a_4709_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X124 Z S[1] a_845_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X125 VPWR D[0] a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X126 a_2854_265# S[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X127 a_1315_591# a_1566_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X128 a_3400_591# a_3277_937# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X129 Z a_2854_265# a_2603_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X130 a_2133_915# D[11] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X131 a_3421_915# S[13] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X132 Z a_1989_937# a_2112_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X133 VGND S[3] a_1989_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X134 VPWR D[7] a_4688_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X135 VGND D[10] a_1315_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X136 VPWR D[13] a_3400_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X137 VGND D[8] a_27_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X138 a_845_915# S[9] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X139 a_278_265# S[0] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X140 a_2603_297# a_2854_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X141 a_4688_333# a_4565_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X142 a_2112_591# a_1989_937# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X143 VGND D[4] a_2603_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X144 Z a_1566_265# a_1315_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X145 Z S[8] a_27_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X146 VGND D[11] a_2133_915# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X147 VPWR D[6] a_3891_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X148 Z a_278_793# a_27_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X149 Z S[13] a_3421_915# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X150 VPWR D[11] a_2112_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X151 VPWR S[3] a_1989_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X152 Z S[6] a_3891_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X153 a_1315_297# a_1566_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X154 a_1566_265# S[2] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X155 a_3400_333# a_3277_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X156 a_2854_793# S[12] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X157 Z a_1989_47# a_2112_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X158 a_1566_793# S[10] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X159 a_278_793# S[8] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
 .ends
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.cdl b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.cdl
index 354a677..46981b1 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.cdl
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.cdl
@@ -20,196 +20,196 @@
 *.PININFO D[0]:I S[15]:I S[14]:I S[13]:I S[12]:I S[11]:I S[10]:I
 *.PININFO S[9]:I S[8]:I S[7]:I S[6]:I S[5]:I S[4]:I S[3]:I S[2]:I
 *.PININFO S[1]:I S[0]:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMNA00 Z S[0] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Z S[0] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 net87 D[0] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA01 net87 D[0] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 SB0 S[0] 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
-MI30 Z S[2] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net51 D[2] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 SB2 S[2] VNB 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
-MI27 SB3 S[3] 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
-MI26 net63 D[3] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Z S[3] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Z S[1] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net75 D[1] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 SB1 S[1] VNB 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
-MI67 Z S[4] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI66 net073 D[4] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI65 SB4 S[4] VNB 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
-MI64 Z S[6] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI63 net085 D[6] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI62 SB6 S[6] VNB 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
-MI61 SB7 S[7] 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
-MI60 net097 D[7] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI59 Z S[7] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI58 Z S[5] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI57 net0109 D[5] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN1 SB0 S[0] 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
-MI56 SB5 S[5] VNB nshort m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI30 Z S[2] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI136 Z S[8] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI135 net0210 D[8] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI29 net51 D[2] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI134 SB8 S[8] VNB nshort m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI28 SB2 S[2] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI133 Z S[9] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI27 SB3 S[3] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI132 net0222 D[9] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI26 net63 D[3] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI131 SB9 S[9] VNB nshort m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI25 Z S[3] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI130 Z S[12] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI13 Z S[1] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI129 net0234 D[12] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI12 net75 D[1] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI128 SB12 S[12] VNB nshort m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 SB1 S[1] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI127 Z S[13] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI67 Z S[4] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI126 net0246 D[13] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI66 net073 D[4] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI125 SB13 S[13] VNB nshort m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI65 SB4 S[4] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI124 Z S[10] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI64 Z S[6] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI123 net0258 D[10] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI63 net085 D[6] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI122 SB10 S[10] VNB nshort m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI62 SB6 S[6] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI121 SB11 S[11] VNB nshort m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI61 SB7 S[7] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI120 net0270 D[11] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI60 net097 D[7] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI119 Z S[11] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI59 Z S[7] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI118 Z S[14] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI58 Z S[5] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI117 net0282 D[14] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI57 net0109 D[5] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI116 SB14 S[14] VNB nshort m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI56 SB5 S[5] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI115 SB15 S[15] VNB nshort m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI136 Z S[8] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI114 net0294 D[15] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI135 net0210 D[8] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI113 Z S[15] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 net99 SB2 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 SB2 S[2] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR D[0] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 net135 SB0 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI134 SB8 S[8] 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 SB3 S[3] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI133 Z S[9] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net111 SB3 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 VPWR D[3] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 SB0 S[0] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net123 SB1 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 VPWR D[1] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 SB1 S[1] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 VPWR D[2] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI79 net0165 SB6 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI132 net0222 D[9] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI78 SB6 S[6] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI77 VPWR D[4] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI76 net0177 SB4 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI131 SB9 S[9] 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
-MI75 SB7 S[7] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI130 Z S[12] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI74 net0185 SB7 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI129 net0234 D[12] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI73 VPWR D[7] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI128 SB12 S[12] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI127 Z S[13] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI72 SB4 S[4] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI126 net0246 D[13] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI125 SB13 S[13] 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
+MI124 Z S[10] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI71 net0197 SB5 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI123 net0258 D[10] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI70 VPWR D[5] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI122 SB10 S[10] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI121 SB11 S[11] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI120 net0270 D[11] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI119 Z S[11] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI69 SB5 S[5] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI118 Z S[14] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI68 VPWR D[6] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI117 net0282 D[14] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI116 SB14 S[14] 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
+MI115 SB15 S[15] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI114 net0294 D[15] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI113 Z S[15] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI160 VPWR D[8] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI159 net0402 SB8 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI35 net99 SB2 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI158 SB8 S[8] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI157 net0410 SB9 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI34 SB2 S[2] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI156 VPWR D[9] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI155 SB9 S[9] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI154 VPWR D[12] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI153 net0426 SB12 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR D[0] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI152 SB12 S[12] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MMPA01 net135 SB0 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI151 net0434 SB13 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI33 SB3 S[3] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI150 VPWR D[13] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI149 SB13 S[13] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI32 net111 SB3 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI148 net0446 SB10 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI31 VPWR D[3] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI147 SB10 S[10] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MMIP1 SB0 S[0] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI146 SB11 S[11] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI15 net123 SB1 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI145 net0458 SB11 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI16 VPWR D[1] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI144 VPWR D[11] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI143 VPWR D[10] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI142 net0470 SB14 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI14 SB1 S[1] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI141 SB14 S[14] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI36 VPWR D[2] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI140 SB15 S[15] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI79 net0165 SB6 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI139 net0482 SB15 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI78 SB6 S[6] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI138 VPWR D[15] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI137 VPWR D[14] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI77 VPWR D[4] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI76 net0177 SB4 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI75 SB7 S[7] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI74 net0185 SB7 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI73 VPWR D[7] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI72 SB4 S[4] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI71 net0197 SB5 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI70 VPWR D[5] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI69 SB5 S[5] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI68 VPWR D[6] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI160 VPWR D[8] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI159 net0402 SB8 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI158 SB8 S[8] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI157 net0410 SB9 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI156 VPWR D[9] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI155 SB9 S[9] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI154 VPWR D[12] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI153 net0426 SB12 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI152 SB12 S[12] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI151 net0434 SB13 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI150 VPWR D[13] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI149 SB13 S[13] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI148 net0446 SB10 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI147 SB10 S[10] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI146 SB11 S[11] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI145 net0458 SB11 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI144 VPWR D[11] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI143 VPWR D[10] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI142 net0470 SB14 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI141 SB14 S[14] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI140 SB15 S[15] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI139 net0482 SB15 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI138 VPWR D[15] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI137 VPWR D[14] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__muxb16to1_4
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.netlist.tsv b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.netlist.tsv
index a55b549..8dec8f8 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.netlist.tsv
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.netlist.tsv
@@ -1,98 +1,98 @@
 sky130_fd_sc_hdll__muxb16to1_4	D[15]:I D[14]:I D[13]:I D[12]:I D[11]:I D[10]:I D[9]:I D[8]:I D[7]:I D[6]:I D[5]:I D[4]:I D[3]:I D[2]:I D[1]:I D[0]:I S[15]:I S[14]:I S[13]:I S[12]:I S[11]:I S[10]:I S[9]:I S[8]:I S[7]:I S[6]:I S[5]:I S[4]:I S[3]:I S[2]:I S[1]:I S[0]: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
-MMNA00	MOSFET	Z	S[0]	net87	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	net87	D[0]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	SB0	S[0]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	Z	S[2]	net51	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net51	D[2]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	SB2	S[2]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	SB3	S[3]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net63	D[3]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Z	S[3]	net63	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Z	S[1]	net75	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net75	D[1]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	SB1	S[1]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI67	MOSFET	Z	S[4]	net073	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI66	MOSFET	net073	D[4]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI65	MOSFET	SB4	S[4]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI64	MOSFET	Z	S[6]	net085	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI63	MOSFET	net085	D[6]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI62	MOSFET	SB6	S[6]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI61	MOSFET	SB7	S[7]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI60	MOSFET	net097	D[7]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI59	MOSFET	Z	S[7]	net097	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI58	MOSFET	Z	S[5]	net0109	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI57	MOSFET	net0109	D[5]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI56	MOSFET	SB5	S[5]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI136	MOSFET	Z	S[8]	net0210	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI135	MOSFET	net0210	D[8]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI134	MOSFET	SB8	S[8]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI133	MOSFET	Z	S[9]	net0222	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI132	MOSFET	net0222	D[9]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI131	MOSFET	SB9	S[9]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI130	MOSFET	Z	S[12]	net0234	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI129	MOSFET	net0234	D[12]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI128	MOSFET	SB12	S[12]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI127	MOSFET	Z	S[13]	net0246	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI126	MOSFET	net0246	D[13]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI125	MOSFET	SB13	S[13]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI124	MOSFET	Z	S[10]	net0258	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI123	MOSFET	net0258	D[10]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI122	MOSFET	SB10	S[10]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI121	MOSFET	SB11	S[11]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI120	MOSFET	net0270	D[11]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI119	MOSFET	Z	S[11]	net0270	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI118	MOSFET	Z	S[14]	net0282	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI117	MOSFET	net0282	D[14]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI116	MOSFET	SB14	S[14]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI115	MOSFET	SB15	S[15]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI114	MOSFET	net0294	D[15]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI113	MOSFET	Z	S[15]	net0294	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI35	MOSFET	net99	SB2	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	SB2	S[2]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	D[0]	net135	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	net135	SB0	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	SB3	S[3]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net111	SB3	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	VPWR	D[3]	net111	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	SB0	S[0]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net123	SB1	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	VPWR	D[1]	net123	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	SB1	S[1]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	VPWR	D[2]	net99	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI79	MOSFET	net0165	SB6	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI78	MOSFET	SB6	S[6]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI77	MOSFET	VPWR	D[4]	net0177	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI76	MOSFET	net0177	SB4	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI75	MOSFET	SB7	S[7]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI74	MOSFET	net0185	SB7	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI73	MOSFET	VPWR	D[7]	net0185	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI72	MOSFET	SB4	S[4]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI71	MOSFET	net0197	SB5	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI70	MOSFET	VPWR	D[5]	net0197	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI69	MOSFET	SB5	S[5]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI68	MOSFET	VPWR	D[6]	net0165	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI160	MOSFET	VPWR	D[8]	net0402	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI159	MOSFET	net0402	SB8	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI158	MOSFET	SB8	S[8]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI157	MOSFET	net0410	SB9	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI156	MOSFET	VPWR	D[9]	net0410	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI155	MOSFET	SB9	S[9]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI154	MOSFET	VPWR	D[12]	net0426	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI153	MOSFET	net0426	SB12	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI152	MOSFET	SB12	S[12]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI151	MOSFET	net0434	SB13	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI150	MOSFET	VPWR	D[13]	net0434	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI149	MOSFET	SB13	S[13]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI148	MOSFET	net0446	SB10	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI147	MOSFET	SB10	S[10]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI146	MOSFET	SB11	S[11]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI145	MOSFET	net0458	SB11	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI144	MOSFET	VPWR	D[11]	net0458	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI143	MOSFET	VPWR	D[10]	net0446	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI142	MOSFET	net0470	SB14	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI141	MOSFET	SB14	S[14]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI140	MOSFET	SB15	S[15]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI139	MOSFET	net0482	SB15	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI138	MOSFET	VPWR	D[15]	net0482	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI137	MOSFET	VPWR	D[14]	net0470	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Z	S[0]	net87	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	net87	D[0]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	SB0	S[0]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	Z	S[2]	net51	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net51	D[2]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	SB2	S[2]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	SB3	S[3]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net63	D[3]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Z	S[3]	net63	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Z	S[1]	net75	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net75	D[1]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	SB1	S[1]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI67	MOSFET	Z	S[4]	net073	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI66	MOSFET	net073	D[4]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI65	MOSFET	SB4	S[4]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI64	MOSFET	Z	S[6]	net085	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI63	MOSFET	net085	D[6]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI62	MOSFET	SB6	S[6]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI61	MOSFET	SB7	S[7]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI60	MOSFET	net097	D[7]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI59	MOSFET	Z	S[7]	net097	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI58	MOSFET	Z	S[5]	net0109	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI57	MOSFET	net0109	D[5]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI56	MOSFET	SB5	S[5]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI136	MOSFET	Z	S[8]	net0210	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI135	MOSFET	net0210	D[8]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI134	MOSFET	SB8	S[8]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI133	MOSFET	Z	S[9]	net0222	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI132	MOSFET	net0222	D[9]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI131	MOSFET	SB9	S[9]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI130	MOSFET	Z	S[12]	net0234	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI129	MOSFET	net0234	D[12]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI128	MOSFET	SB12	S[12]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI127	MOSFET	Z	S[13]	net0246	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI126	MOSFET	net0246	D[13]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI125	MOSFET	SB13	S[13]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI124	MOSFET	Z	S[10]	net0258	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI123	MOSFET	net0258	D[10]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI122	MOSFET	SB10	S[10]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI121	MOSFET	SB11	S[11]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI120	MOSFET	net0270	D[11]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI119	MOSFET	Z	S[11]	net0270	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI118	MOSFET	Z	S[14]	net0282	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI117	MOSFET	net0282	D[14]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI116	MOSFET	SB14	S[14]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI115	MOSFET	SB15	S[15]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI114	MOSFET	net0294	D[15]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI113	MOSFET	Z	S[15]	net0294	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI35	MOSFET	net99	SB2	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	SB2	S[2]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	D[0]	net135	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	net135	SB0	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	SB3	S[3]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net111	SB3	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	VPWR	D[3]	net111	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	SB0	S[0]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net123	SB1	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	VPWR	D[1]	net123	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	SB1	S[1]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	VPWR	D[2]	net99	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI79	MOSFET	net0165	SB6	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI78	MOSFET	SB6	S[6]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI77	MOSFET	VPWR	D[4]	net0177	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI76	MOSFET	net0177	SB4	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI75	MOSFET	SB7	S[7]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI74	MOSFET	net0185	SB7	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI73	MOSFET	VPWR	D[7]	net0185	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI72	MOSFET	SB4	S[4]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI71	MOSFET	net0197	SB5	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI70	MOSFET	VPWR	D[5]	net0197	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI69	MOSFET	SB5	S[5]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI68	MOSFET	VPWR	D[6]	net0165	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI160	MOSFET	VPWR	D[8]	net0402	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI159	MOSFET	net0402	SB8	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI158	MOSFET	SB8	S[8]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI157	MOSFET	net0410	SB9	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI156	MOSFET	VPWR	D[9]	net0410	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI155	MOSFET	SB9	S[9]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI154	MOSFET	VPWR	D[12]	net0426	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI153	MOSFET	net0426	SB12	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI152	MOSFET	SB12	S[12]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI151	MOSFET	net0434	SB13	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI150	MOSFET	VPWR	D[13]	net0434	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI149	MOSFET	SB13	S[13]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI148	MOSFET	net0446	SB10	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI147	MOSFET	SB10	S[10]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI146	MOSFET	SB11	S[11]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI145	MOSFET	net0458	SB11	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI144	MOSFET	VPWR	D[11]	net0458	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI143	MOSFET	VPWR	D[10]	net0446	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI142	MOSFET	net0470	SB14	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI141	MOSFET	SB14	S[14]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI140	MOSFET	SB15	S[15]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI139	MOSFET	net0482	SB15	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI138	MOSFET	VPWR	D[15]	net0482	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI137	MOSFET	VPWR	D[14]	net0470	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.spice b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.spice
index 0af703d..fecde2f 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.spice
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.spice
@@ -18,644 +18,324 @@
 .subckt sky130_fd_sc_hdll__muxb16to1_4 D[15] D[14] D[13] D[12] D[11] D[10] D[9] D[8]
 + D[7] D[6] D[5] D[4] D[3] D[2] D[1] D[0] S[15] S[14] S[13] S[12] S[11] S[10] S[9]
 + S[8] S[7] S[6] S[5] S[4] S[3] S[2] S[1] S[0] VGND VNB VPB VPWR Z
-M1000 a_2693_591# a_3135_793# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=7.6096e+12p ps=7.104e+07u
-M1001 a_2695_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=1.32704e+13p ps=1.36e+08u
-M1002 a_1643_311# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=2.03648e+13p ps=1.9232e+08u
-M1003 a_9513_66# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=4.4928e+12p ps=5.056e+07u
-M1004 a_7939_911# D[14] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1005 a_7939_911# S[14] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_5361_591# D[12] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1007 Z a_1430_325# a_1643_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1430_599# S[9] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1009 a_8379_265# S[6] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1010 a_2695_911# S[10] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1011 a_1643_613# D[9] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1012 VGND D[12] a_5363_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1013 Z a_9250_325# a_9463_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1014 VPWR D[0] a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1015 VPWR S[6] a_8379_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1016 VPWR S[4] a_5803_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1017 a_559_793# S[8] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1018 VPWR S[0] a_559_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1019 VGND D[9] a_1693_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1020 a_2693_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1021 VGND D[4] a_5363_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1022 a_6674_325# S[5] VPWR VPB phighvt w=820000u l=180000u
-+  ad=2.378e+11p pd=2.22e+06u as=0p ps=0u
-M1023 VPWR D[8] a_117_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1024 a_2693_591# D[10] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_7937_591# a_8379_793# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1026 Z a_559_793# a_117_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Z S[9] a_1693_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_8379_793# S[14] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1029 VGND D[5] a_6937_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1030 a_4269_66# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1031 Z S[3] a_4269_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1693_918# S[9] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND D[10] a_2695_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR S[13] a_6674_599# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1035 Z S[2] a_2695_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_2695_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND S[4] a_5803_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1038 VPWR D[1] a_1643_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 Z S[1] a_1693_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1040 VPWR D[7] a_9463_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VGND D[3] a_4269_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR D[3] a_4219_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1043 a_3135_793# S[10] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1044 a_5363_911# S[12] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_1693_66# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 Z a_6674_325# a_6887_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1047 a_4269_918# S[11] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1048 a_1643_311# a_1430_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VGND D[1] a_1693_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 a_5361_297# a_5803_265# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1051 VPWR D[9] a_1643_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VPWR D[11] a_4219_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1053 a_119_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1054 VGND S[11] a_4006_599# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1055 Z a_5803_793# a_5361_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 VPWR D[15] a_9463_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1057 a_6937_66# D[5] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 a_9463_311# a_9250_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 Z S[3] a_4269_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 VGND S[13] a_6674_599# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1061 a_559_265# S[0] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 VGND D[2] a_2695_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 a_8379_265# S[6] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 Z S[14] a_7939_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 a_3135_265# S[2] VPWR VPB phighvt w=820000u l=180000u
-+  ad=2.378e+11p pd=2.22e+06u as=0p ps=0u
-M1066 VPWR S[11] a_4006_599# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1067 VPWR D[2] a_2693_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1068 VGND D[7] a_9513_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 a_7939_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1070 Z S[8] a_119_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1071 a_4219_613# a_4006_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1072 a_4006_599# S[11] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1073 a_9513_918# D[15] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1074 Z S[0] a_119_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1075 VGND S[6] a_8379_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1076 VPWR D[10] a_2693_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 Z a_8379_793# a_7937_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1078 VGND S[8] a_559_793# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1079 a_117_591# a_559_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1080 Z a_3135_793# a_2693_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1081 a_7937_297# a_8379_265# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1082 a_2693_297# a_3135_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1083 VPWR S[10] a_3135_793# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1084 VGND D[0] a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1085 VGND D[8] a_119_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1086 a_5803_265# S[4] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1087 a_9463_311# D[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1088 VPWR D[5] a_6887_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1089 a_4219_311# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1090 a_119_911# D[8] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1091 a_5363_911# S[12] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1092 Z a_6674_599# a_6887_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1093 Z S[1] a_1693_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1094 a_6887_311# a_6674_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1095 a_5803_265# S[4] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1096 a_1693_918# S[9] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1097 VGND S[14] a_8379_793# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1098 a_1693_66# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1099 VPWR D[6] a_7937_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1100 a_4269_66# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1101 a_4219_613# D[11] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1102 VPWR D[13] a_6887_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1103 a_9463_613# D[15] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1104 Z S[15] a_9513_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1105 a_119_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1106 a_4269_66# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1107 VGND S[9] a_1430_599# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1108 a_2695_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1109 VPWR D[14] a_7937_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1110 a_2695_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1111 a_1693_918# D[9] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1112 a_1643_613# a_1430_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1113 a_1693_66# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1114 Z a_4006_599# a_4219_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1115 a_9513_66# D[7] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1116 VPWR D[3] a_4219_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1117 a_6887_613# a_6674_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1118 a_5361_297# a_5803_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1119 Z a_5803_793# a_5361_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1120 VPWR S[12] a_5803_793# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1121 a_4219_311# a_4006_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1122 VGND D[6] a_7939_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1123 VPWR S[8] a_559_793# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1124 VPWR S[14] a_8379_793# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1125 Z S[0] a_119_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1126 VGND S[5] a_6674_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1127 Z a_559_793# a_117_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1128 a_5363_911# D[12] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1129 VPWR D[11] a_4219_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1130 a_6674_599# S[13] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1131 a_9463_311# D[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1132 VGND D[13] a_6937_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1133 VPWR S[1] a_1430_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1134 a_1643_311# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1135 a_4269_66# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1136 a_6937_918# D[13] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1137 a_117_297# a_559_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1138 Z a_3135_265# a_2693_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1139 a_559_265# S[0] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1140 Z a_1430_325# a_1643_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1141 a_9250_325# S[7] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1142 VPWR S[7] a_9250_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1143 a_2695_911# D[10] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1144 VGND D[15] a_9513_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1145 a_9463_613# D[15] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1146 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1147 a_7939_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1148 a_1643_613# D[9] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1149 a_6937_918# S[13] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1150 a_4006_325# S[3] VPWR VPB phighvt w=820000u l=180000u
-+  ad=2.378e+11p pd=2.22e+06u as=0p ps=0u
-M1151 VPWR D[7] a_9463_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1152 a_6674_325# S[5] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1153 Z a_9250_325# a_9463_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1154 Z S[4] a_5363_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1155 a_117_591# D[8] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1156 VPWR D[15] a_9463_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1157 a_2693_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1158 VPWR D[4] a_5361_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1159 a_119_911# S[8] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1160 Z S[11] a_4269_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1161 Z a_1430_599# a_1643_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1162 Z S[14] a_7939_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1163 a_9463_311# a_9250_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1164 a_2693_591# D[10] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1165 VPWR D[12] a_5361_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1166 Z a_9250_599# a_9463_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1167 VGND D[1] a_1693_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1168 Z a_8379_265# a_7937_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1169 a_9513_918# S[15] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1170 a_8379_793# S[14] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1171 Z a_4006_325# a_4219_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1172 a_559_793# S[8] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1173 a_3135_793# S[10] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1174 a_9250_599# S[15] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1175 a_6937_66# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1176 VPWR D[6] a_7937_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1177 a_5363_47# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1178 VGND D[9] a_1693_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1179 VGND D[14] a_7939_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1180 a_1430_325# S[1] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1181 a_2693_297# a_3135_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1182 VGND D[2] a_2695_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1183 a_6887_311# D[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1184 VPWR D[14] a_7937_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1185 a_9250_325# S[7] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1186 a_6887_613# D[13] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1187 VGND D[12] a_5363_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1188 a_5803_793# S[12] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1189 VGND D[14] a_7939_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1190 a_9513_918# D[15] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1191 Z S[4] a_5363_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1192 VGND S[0] a_559_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1193 VGND D[3] a_4269_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1194 a_5361_297# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1195 VGND D[10] a_2695_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1196 Z a_6674_599# a_6887_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1197 Z S[15] a_9513_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1198 VGND S[7] a_9250_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1199 a_1643_613# a_1430_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1200 a_5361_591# a_5803_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1201 a_5803_793# S[12] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1202 a_7939_47# S[6] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1203 a_5361_591# D[12] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1204 a_9463_613# a_9250_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1205 a_5363_47# S[4] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1206 a_7937_297# a_8379_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1207 Z a_559_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1208 VPWR D[0] a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1209 Z S[7] a_9513_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1210 a_6937_66# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1211 a_6674_599# S[13] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1212 Z S[6] a_7939_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1213 a_5363_47# S[4] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1214 Z S[10] a_2695_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1215 VGND S[10] a_3135_793# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1216 a_9513_66# D[7] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1217 VPWR D[5] a_6887_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1218 Z S[12] a_5363_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1219 a_119_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1220 Z S[5] a_6937_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1221 VPWR D[8] a_117_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1222 VGND S[2] a_3135_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1223 VGND S[15] a_9250_599# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1224 VPWR D[13] a_6887_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1225 VPWR S[9] a_1430_599# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1226 a_6937_918# S[13] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1227 a_7937_591# a_8379_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1228 Z S[5] a_6937_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1229 a_2693_591# a_3135_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1230 a_7939_911# S[14] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1231 Z a_5803_265# a_5361_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1232 VGND D[4] a_5363_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1233 VPWR S[15] a_9250_599# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1234 VGND S[3] a_4006_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1235 VGND D[8] a_119_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1236 a_119_911# S[8] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1237 a_4006_599# S[11] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1238 a_6887_613# a_6674_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1239 a_3135_265# S[2] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1240 a_119_911# D[8] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1241 VGND S[1] a_1430_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1242 Z S[13] a_6937_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1243 a_4219_311# a_4006_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1244 a_7939_47# S[6] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1245 a_4269_918# D[11] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1246 a_7937_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1247 VGND D[5] a_6937_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1248 Z a_8379_265# a_7937_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1249 a_117_297# a_559_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1250 Z a_3135_265# a_2693_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1251 a_7937_591# D[14] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1252 a_9513_918# S[15] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1253 Z S[7] a_9513_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1254 Z S[6] a_7939_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1255 a_6887_311# D[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1256 VPWR S[5] a_6674_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1257 a_5361_591# a_5803_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1258 VGND D[6] a_7939_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1259 Z S[9] a_1693_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1260 a_4219_613# a_4006_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1261 Z a_6674_325# a_6887_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1262 a_6937_66# D[5] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1263 Z S[10] a_2695_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1264 a_6887_613# D[13] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1265 VPWR D[4] a_5361_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1266 a_1430_599# S[9] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1267 a_5363_911# D[12] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1268 a_2695_911# S[10] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1269 a_117_591# a_559_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1270 Z a_3135_793# a_2693_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1271 VPWR D[1] a_1643_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1272 a_9513_66# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1273 Z a_1430_599# a_1643_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1274 a_6937_918# D[13] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1275 a_5363_47# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1276 a_1693_918# D[9] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1277 VPWR D[12] a_5361_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1278 VGND D[15] a_9513_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1279 a_9250_599# S[15] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1280 VPWR S[3] a_4006_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1281 VGND D[7] a_9513_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1282 a_7937_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1283 VGND S[12] a_5803_793# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1284 a_1643_311# a_1430_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1285 VPWR D[9] a_1643_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1286 Z a_9250_599# a_9463_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1287 Z a_4006_325# a_4219_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1288 a_1430_325# S[1] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1289 a_4219_311# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1290 Z S[13] a_6937_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1291 a_4006_325# S[3] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1292 a_6887_311# a_6674_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1293 a_7937_591# D[14] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1294 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1295 Z a_5803_265# a_5361_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1296 VGND D[11] a_4269_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1297 a_4219_613# D[11] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1298 VGND D[13] a_6937_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1299 Z a_559_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1300 VGND D[0] a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1301 VPWR D[2] a_2693_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1302 Z S[8] a_119_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1303 a_9463_613# a_9250_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1304 a_117_591# D[8] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1305 a_7939_911# D[14] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1306 Z S[2] a_2695_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1307 a_2695_911# D[10] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1308 VPWR S[2] a_3135_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1309 VPWR D[10] a_2693_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1310 VGND D[11] a_4269_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1311 a_4269_918# D[11] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1312 Z S[12] a_5363_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1313 Z a_4006_599# a_4219_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1314 Z a_8379_793# a_7937_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1315 a_1693_66# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1316 Z S[11] a_4269_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1317 a_119_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1318 a_4269_918# S[11] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1319 a_5361_297# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR D[8] a_117_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Z S[10] a_2695_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X2 VGND D[13] a_6937_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_9250_599# S[15] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X4 a_2695_47# D[2] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VGND D[2] a_2695_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR D[7] a_9463_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_6937_918# S[13] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X8 a_119_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X9 VGND D[0] a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VGND D[6] a_7939_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 Z a_4006_599# a_4219_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X12 VPWR D[13] a_6887_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_6937_66# D[5] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 Z S[11] a_4269_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X15 Z S[14] a_7939_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X16 VGND S[8] a_559_793# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1643_311# a_1430_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X18 Z a_9250_599# a_9463_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X19 a_7939_47# S[6] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X20 VPWR S[8] a_559_793# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X21 VGND D[6] a_7939_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 VGND D[11] a_4269_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VPWR D[12] a_5361_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 Z a_8379_265# a_7937_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X25 VGND D[8] a_119_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 a_4269_918# D[11] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 Z S[12] a_5363_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X28 Z a_3135_793# a_2693_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X29 Z a_5803_793# a_5361_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X30 a_559_265# S[0] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_7939_47# D[6] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X32 a_117_591# D[8] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 VPWR D[11] a_4219_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X34 VPWR D[2] a_2693_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 a_1430_599# S[9] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 a_3135_265# S[2] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_4219_311# a_4006_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X38 a_7937_297# D[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X39 a_9463_613# a_9250_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X40 a_1693_66# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X41 VGND D[2] a_2695_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X42 a_9463_311# D[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X43 Z a_3135_265# a_2693_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X44 Z a_559_793# a_117_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X45 a_5361_591# D[12] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X46 VPWR S[14] a_8379_793# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X47 Z S[0] a_119_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X48 a_4269_66# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X49 Z S[3] a_4269_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X50 a_559_793# S[8] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X51 a_2693_591# a_3135_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X52 VGND S[3] a_4006_325# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X53 VPWR D[8] a_117_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X54 Z S[9] a_1693_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X55 a_4219_613# D[11] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X56 a_1643_311# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X57 a_3135_265# S[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X58 Z S[7] a_9513_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X59 VGND S[14] a_8379_793# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X60 a_2695_911# S[10] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X61 a_9463_613# D[15] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X62 VPWR D[6] a_7937_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X63 Z S[4] a_5363_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X64 VGND S[13] a_6674_599# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X65 a_4269_918# D[11] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X66 Z S[6] a_7939_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X67 Z S[4] a_5363_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X68 a_117_591# a_559_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X69 a_1430_325# S[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X70 a_6887_311# D[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X71 Z S[3] a_4269_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X72 a_2693_591# D[10] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X73 VPWR S[2] a_3135_265# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X74 VGND S[0] a_559_265# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X75 Z a_6674_599# a_6887_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X76 VPWR D[0] a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X77 VGND S[12] a_5803_793# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X78 a_4006_599# S[11] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X79 VGND S[4] a_5803_265# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X80 a_6674_325# S[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X81 a_5803_793# S[12] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X82 a_1693_66# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X83 VGND D[1] a_1693_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X84 Z S[14] a_7939_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X85 VPWR D[5] a_6887_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X86 a_4006_325# S[3] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X87 VPWR D[9] a_1643_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X88 VGND D[5] a_6937_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X89 VGND D[3] a_4269_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X90 a_5361_297# a_5803_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X91 a_4006_599# S[11] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X92 VPWR D[10] a_2693_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X93 a_8379_793# S[14] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X94 a_6937_66# S[5] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X95 a_9250_325# S[7] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X96 Z S[10] a_2695_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X97 a_1643_613# a_1430_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X98 a_9513_66# S[7] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X99 VGND D[8] a_119_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X100 Z a_559_265# a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X101 a_6937_66# S[5] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X102 VPWR S[5] a_6674_325# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X103 VPWR S[12] a_5803_793# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X104 VPWR D[14] a_7937_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X105 VPWR D[4] a_5361_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X106 Z a_8379_793# a_7937_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X107 VGND D[7] a_9513_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X108 a_5363_47# S[4] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X109 Z S[11] a_4269_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X110 a_9513_918# D[15] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X111 a_1693_66# S[1] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X112 a_4269_66# S[3] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X113 VPWR S[15] a_9250_599# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X114 a_117_297# D[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X115 a_559_265# S[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X116 VPWR D[3] a_4219_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X117 VGND D[15] a_9513_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X118 Z a_4006_325# a_4219_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X119 a_5361_297# a_5803_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X120 Z S[8] a_119_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X121 VGND S[15] a_9250_599# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X122 VGND D[10] a_2695_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X123 a_4219_613# a_4006_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X124 a_7939_911# S[14] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X125 a_6887_613# D[13] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X126 Z a_3135_793# a_2693_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X127 VPWR S[3] a_4006_325# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X128 VGND D[1] a_1693_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X129 a_5361_297# D[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X130 Z a_1430_325# a_1643_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X131 VGND D[5] a_6937_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X132 VPWR D[0] a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X133 a_8379_265# S[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X134 a_4219_311# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X135 Z S[2] a_2695_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X136 VGND S[7] a_9250_325# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X137 Z S[5] a_6937_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X138 Z a_5803_265# a_5361_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X139 a_9513_918# S[15] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X140 a_9463_311# D[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X141 a_7937_297# a_8379_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X142 a_2693_297# D[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X143 VGND S[1] a_1430_325# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X144 a_9463_311# a_9250_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X145 a_6937_918# S[13] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X146 a_7937_591# D[14] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X147 a_9513_918# D[15] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X148 a_1643_311# a_1430_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X149 Z S[2] a_2695_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X150 VGND S[9] a_1430_599# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X151 a_9250_599# S[15] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X152 VGND S[2] a_3135_265# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X153 a_2693_297# a_3135_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X154 a_2695_911# D[10] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X155 VPWR D[12] a_5361_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X156 VGND D[10] a_2695_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X157 a_6887_311# a_6674_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X158 a_119_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X159 a_117_591# D[8] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X160 a_2693_591# D[10] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X161 VPWR D[11] a_4219_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X162 VPWR D[1] a_1643_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X163 a_4269_66# S[3] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X164 a_119_47# D[0] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X165 VPWR D[2] a_2693_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X166 a_1693_918# S[9] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X167 a_6937_918# D[13] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X168 a_5361_591# a_5803_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X169 Z S[15] a_9513_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X170 VPWR D[15] a_9463_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X171 a_2695_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X172 a_3135_793# S[10] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X173 Z a_559_793# a_117_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X174 VPWR S[1] a_1430_325# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X175 a_6674_325# S[5] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X176 VPWR D[6] a_7937_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X177 a_7939_47# S[6] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X178 a_5803_265# S[4] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X179 Z a_6674_325# a_6887_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X180 a_3135_793# S[10] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X181 VGND D[14] a_7939_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X182 VGND D[0] a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X183 a_8379_265# S[6] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X184 Z S[8] a_119_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X185 a_1430_599# S[9] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X186 a_4219_613# D[11] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X187 a_2695_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X188 Z a_9250_325# a_9463_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X189 a_7939_911# S[14] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X190 a_2695_911# D[10] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X191 VPWR S[10] a_3135_793# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X192 Z a_4006_599# a_4219_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X193 a_5361_591# a_5803_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X194 a_9250_325# S[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X195 a_6887_311# D[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X196 a_1643_613# D[9] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X197 a_6674_599# S[13] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X198 Z S[12] a_5363_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X199 a_5363_47# D[4] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X200 VGND D[3] a_4269_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X201 a_6887_311# a_6674_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X202 a_9513_918# S[15] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X203 Z S[0] a_119_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X204 a_9513_66# D[7] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X205 Z a_1430_599# a_1643_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X206 VGND D[11] a_4269_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X207 a_7939_911# D[14] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X208 a_119_47# D[0] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X209 a_6937_918# D[13] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X210 a_117_297# a_559_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X211 Z S[1] a_1693_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X212 Z S[7] a_9513_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X213 Z a_8379_265# a_7937_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X214 VGND D[9] a_1693_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X215 a_4269_918# S[11] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X216 Z S[13] a_6937_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X217 Z a_5803_793# a_5361_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X218 VPWR D[9] a_1643_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X219 VPWR S[13] a_6674_599# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X220 a_7937_591# a_8379_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X221 a_119_911# S[8] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X222 VPWR S[0] a_559_265# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X223 Z a_1430_325# a_1643_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X224 Z S[6] a_7939_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X225 a_7937_297# D[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X226 VGND D[15] a_9513_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X227 a_4219_311# a_4006_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X228 Z S[1] a_1693_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X229 a_7939_47# D[6] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X230 a_1643_613# a_1430_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X231 VGND D[12] a_5363_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X232 a_9463_613# a_9250_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X233 VGND S[6] a_8379_265# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X234 a_559_793# S[8] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X235 a_5361_591# D[12] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X236 VPWR D[13] a_6887_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X237 a_7937_297# a_8379_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X238 VPWR D[4] a_5361_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X239 a_2693_591# a_3135_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X240 a_1693_918# S[9] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X241 a_5363_911# S[12] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X242 a_6887_613# a_6674_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X243 Z S[15] a_9513_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X244 a_2693_297# D[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X245 a_4269_66# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X246 VPWR S[11] a_4006_599# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X247 a_7939_911# D[14] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X248 VPWR D[15] a_9463_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X249 a_117_297# D[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X250 VPWR S[6] a_8379_265# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X251 a_5363_47# D[4] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X252 VPWR D[3] a_4219_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X253 Z a_4006_325# a_4219_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X254 a_9513_66# D[7] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X255 VGND D[4] a_5363_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X256 a_1430_325# S[1] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X257 VPWR D[7] a_9463_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X258 a_1693_918# D[9] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X259 a_8379_793# S[14] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X260 VGND D[9] a_1693_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X261 a_9513_66# S[7] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X262 Z a_9250_325# a_9463_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X263 Z a_6674_599# a_6887_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X264 a_5363_911# D[12] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X265 a_5363_47# S[4] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X266 a_4219_311# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X267 VGND D[12] a_5363_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X268 Z a_3135_265# a_2693_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X269 a_1693_66# S[1] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X270 Z a_5803_265# a_5361_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X271 a_119_911# D[8] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X272 VGND S[11] a_4006_599# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X273 a_6674_599# S[13] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X274 Z a_9250_599# a_9463_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X275 Z S[9] a_1693_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X276 VPWR D[10] a_2693_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X277 VGND D[13] a_6937_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X278 a_1643_311# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X279 a_4006_325# S[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X280 a_2695_47# D[2] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X281 a_9463_311# a_9250_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X282 a_5803_265# S[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X283 a_5803_793# S[12] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X284 a_7937_591# D[14] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X285 a_2695_911# S[10] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X286 a_6887_613# a_6674_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X287 a_9463_613# D[15] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X288 Z a_559_265# a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X289 VGND D[4] a_5363_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X290 Z S[13] a_6937_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X291 a_2693_297# a_3135_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X292 VGND D[7] a_9513_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X293 a_1693_918# D[9] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X294 VGND S[10] a_3135_793# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X295 a_117_591# a_559_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X296 a_6937_66# D[5] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X297 Z a_8379_793# a_7937_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X298 Z S[5] a_6937_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X299 a_119_911# S[8] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X300 a_1643_613# D[9] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X301 VGND S[5] a_6674_325# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X302 a_4269_918# S[11] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X303 VPWR D[1] a_1643_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X304 VPWR S[9] a_1430_599# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X305 VPWR S[4] a_5803_265# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X306 Z a_1430_599# a_1643_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X307 VPWR D[14] a_7937_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X308 a_117_297# a_559_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X309 a_5363_911# D[12] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X310 a_4219_613# a_4006_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X311 a_6887_613# D[13] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X312 a_119_911# D[8] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X313 VPWR S[7] a_9250_325# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X314 VPWR D[5] a_6887_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X315 a_5361_297# D[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X316 a_5363_911# S[12] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X317 a_7937_591# a_8379_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X318 VGND D[14] a_7939_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X319 Z a_6674_325# a_6887_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
 .ends
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.cdl b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.cdl
index e7d1dcf..571e2fd 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.cdl
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.cdl
@@ -17,52 +17,52 @@
 .SUBCKT sky130_fd_sc_hdll__muxb4to1_1 D[3] D[2] D[1] D[0] S[3] S[2] S[1] S[0] VGND VNB VPB VPWR Z
 *.PININFO D[3]:I D[2]:I D[1]:I D[0]:I S[3]:I S[2]:I S[1]:I S[0]:I
 *.PININFO VGND:I VNB:I VPB:I VPWR:I Z:O
-MMNA00 Z S[0] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Z S[0] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 net87 D[0] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA01 net87 D[0] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 SB0 S[0] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 Z S[2] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net51 D[2] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 SB2 S[2] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 SB3 S[3] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 net63 D[3] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Z S[3] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Z S[1] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net75 D[1] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 SB1 S[1] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 net99 SB2 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 SB2 S[2] 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
-MMPA00 VPWR D[0] 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
-MMPA01 net135 SB0 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MMIN1 SB0 S[0] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 SB3 S[3] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI30 Z S[2] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net111 SB3 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI29 net51 D[2] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 SB2 S[2] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 VPWR D[3] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI27 SB3 S[3] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 SB0 S[0] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI26 net63 D[3] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 Z S[3] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net123 SB1 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI13 Z S[1] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 VPWR D[1] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI12 net75 D[1] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 SB1 S[1] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 SB1 S[1] 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
-MI36 VPWR D[2] 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
+MI35 net99 SB2 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 SB2 S[2] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR D[0] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 net135 SB0 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 SB3 S[3] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net111 SB3 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 VPWR D[3] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 SB0 S[0] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 net123 SB1 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 VPWR D[1] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 SB1 S[1] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 VPWR D[2] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__muxb4to1_1
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.netlist.tsv b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.netlist.tsv
index 9bc2bf6..d711bf1 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.netlist.tsv
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_hdll__muxb4to1_1	D[3]:I D[2]:I D[1]:I D[0]:I S[3]:I S[2]:I S[1]:I S[0]: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
-MMNA00	MOSFET	Z	S[0]	net87	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	net87	D[0]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	SB0	S[0]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	Z	S[2]	net51	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net51	D[2]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	SB2	S[2]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	SB3	S[3]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net63	D[3]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Z	S[3]	net63	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Z	S[1]	net75	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net75	D[1]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	SB1	S[1]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI35	MOSFET	net99	SB2	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	SB2	S[2]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	D[0]	net135	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	net135	SB0	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	SB3	S[3]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net111	SB3	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	VPWR	D[3]	net111	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	SB0	S[0]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net123	SB1	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	VPWR	D[1]	net123	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	SB1	S[1]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	VPWR	D[2]	net99	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Z	S[0]	net87	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	net87	D[0]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	SB0	S[0]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	Z	S[2]	net51	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net51	D[2]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	SB2	S[2]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	SB3	S[3]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net63	D[3]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Z	S[3]	net63	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Z	S[1]	net75	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net75	D[1]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	SB1	S[1]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI35	MOSFET	net99	SB2	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	SB2	S[2]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	D[0]	net135	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	net135	SB0	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	SB3	S[3]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net111	SB3	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	VPWR	D[3]	net111	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	SB0	S[0]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net123	SB1	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	VPWR	D[1]	net123	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	SB1	S[1]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	VPWR	D[2]	net99	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.spice b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.spice
index e8e39c7..9ae94cd 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.spice
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.spice
@@ -17,52 +17,28 @@
 
 .subckt sky130_fd_sc_hdll__muxb4to1_1 D[3] D[2] D[1] D[0] S[3] S[2] S[1] S[0] VGND
 + VNB VPB VPWR Z
-M1000 a_937_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=9.997e+11p ps=9.4e+06u
-M1001 a_1361_47# S[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=1.69e+12p ps=1.338e+07u
-M1002 a_1574_47# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=5.408e+11p ps=6.24e+06u
-M1003 a_734_333# a_533_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=8.856e+11p ps=8.72e+06u
-M1004 Z S[2] a_937_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_1562_333# a_1361_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1006 a_746_47# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1007 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1008 VPWR D[3] a_1562_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Z a_184_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_533_47# S[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1011 a_945_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1012 Z a_1012_265# a_945_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR S[0] a_184_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1014 VPWR S[2] a_1012_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1015 a_1361_47# S[3] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1016 a_533_47# S[1] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1017 VGND S[0] a_184_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1018 VGND D[1] a_746_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR D[1] a_734_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND D[3] a_1574_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_109_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1022 VGND S[2] a_1012_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1023 Z S[0] a_109_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR S[1] a_533_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND D[2] a_937_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_1012_265# S[2] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X3 a_1574_47# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_1012_265# S[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VPWR D[0] a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_109_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X7 VPWR D[2] a_945_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR S[3] a_1361_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_117_297# a_184_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X10 Z a_533_47# a_734_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X11 a_184_265# S[0] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X12 VGND S[3] a_1361_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X13 VGND S[1] a_533_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X14 a_1562_333# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_945_297# a_1012_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X16 VGND D[0] a_109_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 Z a_1361_47# a_1562_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X18 a_937_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X19 Z S[3] a_1574_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X20 Z S[1] a_746_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X21 a_734_333# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 a_184_265# S[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 a_746_47# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.cdl b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.cdl
index ca8cc1a..474d842 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.cdl
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.cdl
@@ -17,52 +17,52 @@
 .SUBCKT sky130_fd_sc_hdll__muxb4to1_2 D[3] D[2] D[1] D[0] S[3] S[2] S[1] S[0] VGND VNB VPB VPWR Z
 *.PININFO D[3]:I D[2]:I D[1]:I D[0]:I S[3]:I S[2]:I S[1]:I S[0]:I
 *.PININFO VGND:I VNB:I VPB:I VPWR:I Z:O
-MMNA00 Z S[0] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Z S[0] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 net87 D[0] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA01 net87 D[0] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 SB0 S[0] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 Z S[2] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net51 D[2] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 SB2 S[2] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 SB3 S[3] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 net63 D[3] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Z S[3] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Z S[1] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net75 D[1] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 SB1 S[1] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 net99 SB2 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 SB2 S[2] 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
-MMPA00 VPWR D[0] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 net135 SB0 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MMIN1 SB0 S[0] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 SB3 S[3] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI30 Z S[2] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net111 SB3 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI29 net51 D[2] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 SB2 S[2] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 VPWR D[3] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI27 SB3 S[3] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 SB0 S[0] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI26 net63 D[3] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 Z S[3] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net123 SB1 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI13 Z S[1] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 VPWR D[1] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI12 net75 D[1] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 SB1 S[1] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 SB1 S[1] 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
-MI36 VPWR D[2] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI35 net99 SB2 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 SB2 S[2] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR D[0] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 net135 SB0 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 SB3 S[3] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net111 SB3 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 VPWR D[3] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 SB0 S[0] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 net123 SB1 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 VPWR D[1] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 SB1 S[1] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 VPWR D[2] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__muxb4to1_2
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.netlist.tsv b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.netlist.tsv
index 59309e1..9da47f2 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.netlist.tsv
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_hdll__muxb4to1_2	D[3]:I D[2]:I D[1]:I D[0]:I S[3]:I S[2]:I S[1]:I S[0]: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
-MMNA00	MOSFET	Z	S[0]	net87	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	net87	D[0]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	SB0	S[0]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	Z	S[2]	net51	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net51	D[2]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	SB2	S[2]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	SB3	S[3]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net63	D[3]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Z	S[3]	net63	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Z	S[1]	net75	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net75	D[1]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	SB1	S[1]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI35	MOSFET	net99	SB2	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	SB2	S[2]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	D[0]	net135	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	net135	SB0	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	SB3	S[3]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net111	SB3	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	VPWR	D[3]	net111	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	SB0	S[0]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net123	SB1	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	VPWR	D[1]	net123	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	SB1	S[1]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	VPWR	D[2]	net99	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Z	S[0]	net87	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	net87	D[0]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	SB0	S[0]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	Z	S[2]	net51	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net51	D[2]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	SB2	S[2]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	SB3	S[3]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net63	D[3]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Z	S[3]	net63	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Z	S[1]	net75	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net75	D[1]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	SB1	S[1]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI35	MOSFET	net99	SB2	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	SB2	S[2]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	D[0]	net135	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	net135	SB0	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	SB3	S[3]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net111	SB3	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	VPWR	D[3]	net111	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	SB0	S[0]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net123	SB1	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	VPWR	D[1]	net123	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	SB1	S[1]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	VPWR	D[2]	net99	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.spice b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.spice
index 43aa649..cb2ee37 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.spice
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.spice
@@ -17,84 +17,44 @@
 
 .subckt sky130_fd_sc_hdll__muxb4to1_2 D[3] D[2] D[1] D[0] S[3] S[2] S[1] S[0] VGND
 + VNB VPB VPWR Z
-M1000 VPWR D[2] a_1315_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.88e+12p pd=1.576e+07u as=8.211e+11p ps=7.41e+06u
-M1001 VPWR D[3] a_2112_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1002 a_27_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1003 Z a_1566_265# a_1315_297# VPB phighvt w=820000u l=180000u
-+  ad=9.512e+11p pd=8.88e+06u as=0p ps=0u
-M1004 Z a_1989_47# a_2112_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_297# a_278_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR S[0] a_278_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1007 a_1989_47# S[3] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=9.828e+11p ps=1.052e+07u
-M1008 a_2133_69# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1009 Z a_278_265# a_27_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_845_69# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=5.616e+11p ps=6.32e+06u
-M1011 a_27_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1012 Z S[1] a_845_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Z S[0] a_27_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_824_333# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1016 a_1989_47# S[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1017 VPWR D[0] a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_701_47# S[1] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1019 VGND D[1] a_845_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_824_333# a_701_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND S[0] a_278_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1022 a_701_47# S[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1023 VPWR D[1] a_824_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_845_69# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Z S[3] a_2133_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND D[0] a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Z a_701_47# a_824_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1315_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1029 Z S[2] a_1315_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1315_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1315_297# a_1566_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_2112_333# a_1989_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND D[2] a_1315_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_2133_69# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR S[2] a_1566_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1036 a_2112_333# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1315_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND S[2] a_1566_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1039 VGND D[3] a_2133_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1315_47# D[2] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_2112_333# a_1989_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X2 Z a_278_265# a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X3 Z S[0] a_27_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X4 a_845_69# S[1] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X5 VPWR D[3] a_2112_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_27_297# D[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND D[1] a_845_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VGND D[3] a_2133_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_1566_265# S[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 Z a_701_47# a_824_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X11 a_845_69# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_2133_69# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VPWR S[1] a_701_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_824_333# a_701_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X15 a_27_297# a_278_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X16 Z S[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X17 a_27_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X18 VGND S[1] a_701_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X19 a_278_265# S[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 a_2112_333# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR D[1] a_824_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 VPWR D[2] a_1315_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 VGND D[0] a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 a_27_47# D[0] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_1315_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X26 Z S[3] a_2133_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X27 a_824_333# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 a_1315_297# D[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 VGND D[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 a_2133_69# S[3] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X31 VPWR D[0] a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 Z S[1] a_845_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X33 VGND S[3] a_1989_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X34 a_278_265# S[0] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X35 Z a_1566_265# a_1315_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X36 VPWR S[3] a_1989_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X37 a_1315_297# a_1566_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X38 a_1566_265# S[2] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X39 Z a_1989_47# a_2112_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
 .ends
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.cdl b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.cdl
index 57d91ad..f592dfc 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.cdl
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.cdl
@@ -17,52 +17,52 @@
 .SUBCKT sky130_fd_sc_hdll__muxb4to1_4 D[3] D[2] D[1] D[0] S[3] S[2] S[1] S[0] VGND VNB VPB VPWR Z
 *.PININFO D[3]:I D[2]:I D[1]:I D[0]:I S[3]:I S[2]:I S[1]:I S[0]:I
 *.PININFO VGND:I VNB:I VPB:I VPWR:I Z:O
-MMNA00 Z S[0] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Z S[0] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 net87 D[0] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA01 net87 D[0] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 SB0 S[0] 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
-MI30 Z S[2] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net51 D[2] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 SB2 S[2] VNB 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
-MI27 SB3 S[3] 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
-MI26 net63 D[3] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Z S[3] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Z S[1] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net75 D[1] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 SB1 S[1] VNB 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
-MI35 net99 SB2 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 SB2 S[2] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR D[0] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 net135 SB0 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MMIN1 SB0 S[0] 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 SB3 S[3] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI30 Z S[2] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net111 SB3 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI29 net51 D[2] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 SB2 S[2] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 VPWR D[3] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI27 SB3 S[3] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 SB0 S[0] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI26 net63 D[3] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 Z S[3] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net123 SB1 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI13 Z S[1] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 VPWR D[1] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI12 net75 D[1] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 SB1 S[1] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 SB1 S[1] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 VPWR D[2] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI35 net99 SB2 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 SB2 S[2] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR D[0] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 net135 SB0 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 SB3 S[3] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net111 SB3 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 VPWR D[3] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 SB0 S[0] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 net123 SB1 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 VPWR D[1] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 SB1 S[1] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 VPWR D[2] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__muxb4to1_4
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.netlist.tsv b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.netlist.tsv
index cba81ac..3582914 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.netlist.tsv
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_hdll__muxb4to1_4	D[3]:I D[2]:I D[1]:I D[0]:I S[3]:I S[2]:I S[1]:I S[0]: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
-MMNA00	MOSFET	Z	S[0]	net87	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	net87	D[0]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	SB0	S[0]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	Z	S[2]	net51	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net51	D[2]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	SB2	S[2]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	SB3	S[3]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net63	D[3]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Z	S[3]	net63	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Z	S[1]	net75	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net75	D[1]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	SB1	S[1]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI35	MOSFET	net99	SB2	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	SB2	S[2]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	D[0]	net135	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	net135	SB0	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	SB3	S[3]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net111	SB3	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	VPWR	D[3]	net111	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	SB0	S[0]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net123	SB1	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	VPWR	D[1]	net123	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	SB1	S[1]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	VPWR	D[2]	net99	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Z	S[0]	net87	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	net87	D[0]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	SB0	S[0]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	Z	S[2]	net51	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net51	D[2]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	SB2	S[2]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	SB3	S[3]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net63	D[3]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Z	S[3]	net63	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Z	S[1]	net75	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net75	D[1]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	SB1	S[1]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI35	MOSFET	net99	SB2	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	SB2	S[2]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	D[0]	net135	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	net135	SB0	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	SB3	S[3]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net111	SB3	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	VPWR	D[3]	net111	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	SB0	S[0]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net123	SB1	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	VPWR	D[1]	net123	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	SB1	S[1]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	VPWR	D[2]	net99	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.spice b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.spice
index 68290e6..5d204ba 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.spice
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.spice
@@ -17,164 +17,84 @@
 
 .subckt sky130_fd_sc_hdll__muxb4to1_4 D[3] D[2] D[1] D[0] S[3] S[2] S[1] S[0] VGND
 + VNB VPB VPWR Z
-M1000 Z a_1430_325# a_1643_311# VPB phighvt w=820000u l=180000u
-+  ad=1.9024e+12p pd=1.776e+07u as=1.2606e+12p ps=1.174e+07u
-M1001 a_1643_311# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.0912e+12p ps=4.808e+07u
-M1002 a_2695_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=3.3176e+12p ps=3.4e+07u
-M1003 VPWR D[0] a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1004 VPWR S[0] a_559_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1005 a_2693_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1006 VPWR D[1] a_1643_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Z S[1] a_1693_66# VNB nshort w=520000u l=150000u
-+  ad=1.1232e+12p pd=1.264e+07u as=7.618e+11p ps=8.38e+06u
-M1008 Z S[2] a_2695_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_2695_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR D[3] a_4219_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1011 Z S[3] a_4269_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1012 a_4269_66# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND D[3] a_4269_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1643_311# a_1430_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_119_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1016 a_1693_66# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND D[1] a_1693_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_559_265# S[0] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR D[2] a_2693_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_3135_265# S[2] VPWR VPB phighvt w=820000u l=180000u
-+  ad=2.378e+11p pd=2.22e+06u as=0p ps=0u
-M1021 VGND D[2] a_2695_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Z S[3] a_4269_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Z S[0] a_119_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND D[0] a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_2693_297# a_3135_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Z S[1] a_1693_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_4219_311# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_119_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1693_66# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_2695_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_4269_66# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_4269_66# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1693_66# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_2695_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR D[3] a_4219_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR S[1] a_1430_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1037 Z S[0] a_119_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1643_311# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_4219_311# a_4006_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_4269_66# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_117_297# a_559_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 Z a_1430_325# a_1643_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 Z a_3135_265# a_2693_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_4006_325# S[3] VPWR VPB phighvt w=820000u l=180000u
-+  ad=2.378e+11p pd=2.22e+06u as=0p ps=0u
-M1046 a_559_265# S[0] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1047 a_2693_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 Z a_4006_325# a_4219_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VGND D[1] a_1693_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 a_1430_325# S[1] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 a_2693_297# a_3135_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VGND D[2] a_2695_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 VGND S[0] a_559_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 VGND D[3] a_4269_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 VPWR D[0] a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 Z a_559_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 a_119_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 VGND S[2] a_3135_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1059 VGND S[3] a_4006_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1060 a_4219_311# a_4006_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1061 VGND S[1] a_1430_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1062 a_3135_265# S[2] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 a_117_297# a_559_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 Z a_3135_265# a_2693_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 VPWR D[1] a_1643_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 a_1643_311# a_1430_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1067 VPWR S[3] a_4006_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1068 Z a_4006_325# a_4219_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 a_1430_325# S[1] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 a_4219_311# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1071 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1072 Z a_559_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1073 VGND D[0] a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1074 VPWR D[2] a_2693_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1075 a_4006_325# S[3] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1076 VPWR S[2] a_3135_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 Z S[2] a_2695_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1078 a_119_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1079 a_1693_66# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND D[0] a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_119_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X2 VGND D[2] a_2695_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_2695_47# D[2] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_1643_311# a_1430_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X5 VPWR D[2] a_2693_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_559_265# S[0] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_3135_265# S[2] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 Z S[0] a_119_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X9 Z a_3135_265# a_2693_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X10 a_4219_311# a_4006_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X11 a_1693_66# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VGND D[2] a_2695_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_4269_66# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_1643_311# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_3135_265# S[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X16 VGND S[3] a_4006_325# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 Z S[3] a_4269_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X18 a_1430_325# S[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X19 Z S[3] a_4269_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X20 VPWR D[0] a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR S[2] a_3135_265# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X22 VGND S[0] a_559_265# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VGND D[1] a_1693_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 a_1693_66# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_4006_325# S[3] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VGND D[3] a_4269_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 Z a_559_265# a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X28 a_117_297# D[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 a_559_265# S[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X30 Z a_4006_325# a_4219_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X31 a_1693_66# S[1] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X32 VPWR D[3] a_4219_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 a_4269_66# S[3] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X34 VPWR S[3] a_4006_325# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X35 VGND D[1] a_1693_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X36 VPWR D[0] a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X37 Z a_1430_325# a_1643_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X38 Z S[2] a_2695_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X39 a_4219_311# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X40 a_2693_297# D[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X41 VGND S[1] a_1430_325# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X42 a_1643_311# a_1430_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X43 a_2693_297# a_3135_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X44 Z S[2] a_2695_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X45 VGND S[2] a_3135_265# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X46 a_119_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X47 VPWR D[1] a_1643_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X48 a_4269_66# S[3] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X49 a_119_47# D[0] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X50 VPWR D[2] a_2693_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X51 a_2695_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X52 VPWR S[1] a_1430_325# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X53 VGND D[0] a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X54 a_2695_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X55 Z S[0] a_119_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X56 VGND D[3] a_4269_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X57 a_117_297# a_559_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X58 a_119_47# D[0] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X59 Z S[1] a_1693_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X60 VPWR S[0] a_559_265# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X61 Z a_1430_325# a_1643_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X62 a_4219_311# a_4006_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X63 Z S[1] a_1693_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X64 a_117_297# D[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X65 a_2693_297# D[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X66 Z a_4006_325# a_4219_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X67 VPWR D[3] a_4219_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X68 a_4269_66# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X69 a_1430_325# S[1] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X70 a_4219_311# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X71 Z a_3135_265# a_2693_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X72 a_1693_66# S[1] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X73 Z a_559_265# a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X74 a_1643_311# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X75 a_4006_325# S[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X76 a_2695_47# D[2] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X77 a_2693_297# a_3135_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X78 a_117_297# a_559_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X79 VPWR D[1] a_1643_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.cdl b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.cdl
index b4109bd..ca4d6d9 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.cdl
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.cdl
@@ -18,100 +18,100 @@
 *.PININFO D[7]:I D[6]:I D[5]:I D[4]:I D[3]:I D[2]:I D[1]:I D[0]:I
 *.PININFO S[7]:I S[6]:I S[5]:I S[4]:I S[3]:I S[2]:I S[1]:I S[0]:I
 *.PININFO VGND:I VNB:I VPB:I VPWR:I Z:O
-MMNA00 Z S[0] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Z S[0] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 net87 D[0] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA01 net87 D[0] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 SB0 S[0] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 Z S[2] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net51 D[2] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 SB2 S[2] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 SB3 S[3] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 net63 D[3] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Z S[3] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Z S[1] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net75 D[1] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 SB1 S[1] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI67 Z S[4] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI66 net073 D[4] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI65 SB4 S[4] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI64 Z S[6] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI63 net085 D[6] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI62 SB6 S[6] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI61 SB7 S[7] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI60 net097 D[7] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI59 Z S[7] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI58 Z S[5] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI57 net0109 D[5] VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN1 SB0 S[0] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI56 SB5 S[5] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI30 Z S[2] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 net99 SB2 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 SB2 S[2] 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
-MMPA00 VPWR D[0] 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
-MMPA01 net135 SB0 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI29 net51 D[2] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 SB3 S[3] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI28 SB2 S[2] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net111 SB3 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI27 SB3 S[3] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 VPWR D[3] 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
-MMIP1 SB0 S[0] 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
-MI15 net123 SB1 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 VPWR D[1] 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
-MI14 SB1 S[1] 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
-MI36 VPWR D[2] 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
-MI79 net0165 SB6 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI26 net63 D[3] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI78 SB6 S[6] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI25 Z S[3] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI77 VPWR D[4] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI13 Z S[1] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI76 net0177 SB4 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI12 net75 D[1] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI75 SB7 S[7] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI11 SB1 S[1] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI74 net0185 SB7 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI67 Z S[4] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI66 net073 D[4] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI73 VPWR D[7] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI65 SB4 S[4] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI72 SB4 S[4] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI64 Z S[6] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI71 net0197 SB5 VPB phighvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI63 net085 D[6] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI70 VPWR D[5] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI62 SB6 S[6] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI69 SB5 S[5] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI61 SB7 S[7] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI68 VPWR D[6] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI60 net097 D[7] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI59 Z S[7] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI58 Z S[5] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI57 net0109 D[5] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI56 SB5 S[5] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI35 net99 SB2 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 SB2 S[2] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR D[0] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 net135 SB0 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 SB3 S[3] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net111 SB3 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 VPWR D[3] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 SB0 S[0] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 net123 SB1 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 VPWR D[1] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 SB1 S[1] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 VPWR D[2] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI79 net0165 SB6 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI78 SB6 S[6] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI77 VPWR D[4] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI76 net0177 SB4 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI75 SB7 S[7] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI74 net0185 SB7 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI73 VPWR D[7] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI72 SB4 S[4] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI71 net0197 SB5 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI70 VPWR D[5] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI69 SB5 S[5] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI68 VPWR D[6] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__muxb8to1_1
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.netlist.tsv b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.netlist.tsv
index b15bcf8..8a09639 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.netlist.tsv
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.netlist.tsv
@@ -1,50 +1,50 @@
 sky130_fd_sc_hdll__muxb8to1_1	D[7]:I D[6]:I D[5]:I D[4]:I D[3]:I D[2]:I D[1]:I D[0]:I S[7]:I S[6]:I S[5]:I S[4]:I S[3]:I S[2]:I S[1]:I S[0]: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
-MMNA00	MOSFET	Z	S[0]	net87	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	net87	D[0]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	SB0	S[0]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	Z	S[2]	net51	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net51	D[2]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	SB2	S[2]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	SB3	S[3]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net63	D[3]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Z	S[3]	net63	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Z	S[1]	net75	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net75	D[1]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	SB1	S[1]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI67	MOSFET	Z	S[4]	net073	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI66	MOSFET	net073	D[4]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI65	MOSFET	SB4	S[4]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI64	MOSFET	Z	S[6]	net085	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI63	MOSFET	net085	D[6]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI62	MOSFET	SB6	S[6]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI61	MOSFET	SB7	S[7]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI60	MOSFET	net097	D[7]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI59	MOSFET	Z	S[7]	net097	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI58	MOSFET	Z	S[5]	net0109	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI57	MOSFET	net0109	D[5]	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI56	MOSFET	SB5	S[5]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI35	MOSFET	net99	SB2	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	SB2	S[2]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	D[0]	net135	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	net135	SB0	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	SB3	S[3]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net111	SB3	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	VPWR	D[3]	net111	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	SB0	S[0]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net123	SB1	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	VPWR	D[1]	net123	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	SB1	S[1]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	VPWR	D[2]	net99	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI79	MOSFET	net0165	SB6	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI78	MOSFET	SB6	S[6]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI77	MOSFET	VPWR	D[4]	net0177	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI76	MOSFET	net0177	SB4	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI75	MOSFET	SB7	S[7]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI74	MOSFET	net0185	SB7	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI73	MOSFET	VPWR	D[7]	net0185	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI72	MOSFET	SB4	S[4]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI71	MOSFET	net0197	SB5	Z	VPB	phighvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI70	MOSFET	VPWR	D[5]	net0197	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI69	MOSFET	SB5	S[5]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI68	MOSFET	VPWR	D[6]	net0165	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Z	S[0]	net87	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	net87	D[0]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	SB0	S[0]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	Z	S[2]	net51	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net51	D[2]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	SB2	S[2]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	SB3	S[3]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net63	D[3]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Z	S[3]	net63	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Z	S[1]	net75	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net75	D[1]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	SB1	S[1]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI67	MOSFET	Z	S[4]	net073	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI66	MOSFET	net073	D[4]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI65	MOSFET	SB4	S[4]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI64	MOSFET	Z	S[6]	net085	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI63	MOSFET	net085	D[6]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI62	MOSFET	SB6	S[6]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI61	MOSFET	SB7	S[7]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI60	MOSFET	net097	D[7]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI59	MOSFET	Z	S[7]	net097	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI58	MOSFET	Z	S[5]	net0109	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI57	MOSFET	net0109	D[5]	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI56	MOSFET	SB5	S[5]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI35	MOSFET	net99	SB2	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	SB2	S[2]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	D[0]	net135	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	net135	SB0	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	SB3	S[3]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net111	SB3	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	VPWR	D[3]	net111	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	SB0	S[0]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net123	SB1	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	VPWR	D[1]	net123	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	SB1	S[1]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	VPWR	D[2]	net99	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI79	MOSFET	net0165	SB6	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI78	MOSFET	SB6	S[6]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI77	MOSFET	VPWR	D[4]	net0177	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI76	MOSFET	net0177	SB4	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI75	MOSFET	SB7	S[7]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI74	MOSFET	net0185	SB7	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI73	MOSFET	VPWR	D[7]	net0185	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI72	MOSFET	SB4	S[4]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI71	MOSFET	net0197	SB5	Z	VPB	pfet_01v8_hvt	1	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI70	MOSFET	VPWR	D[5]	net0197	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI69	MOSFET	SB5	S[5]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI68	MOSFET	VPWR	D[6]	net0165	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.spice b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.spice
index c4dae0f..c918737 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.spice
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.spice
@@ -17,100 +17,52 @@
 
 .subckt sky130_fd_sc_hdll__muxb8to1_1 D[7] D[6] D[5] D[4] D[3] D[2] D[1] D[0] S[7]
 + S[6] S[5] S[4] S[3] S[2] S[1] S[0] VGND VNB VPB VPWR Z
-M1000 a_1765_47# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=1.8759e+12p ps=1.712e+07u
-M1001 a_937_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1002 a_2593_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1003 a_1773_297# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=3.19e+12p ps=2.438e+07u
-M1004 VGND S[6] a_2668_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1005 a_1361_47# S[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1006 VPWR D[7] a_3218_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.297e+11p ps=2.69e+06u
-M1007 Z a_1840_265# a_1773_297# VPB phighvt w=820000u l=180000u
-+  ad=1.7712e+12p pd=1.744e+07u as=0p ps=0u
-M1008 a_1574_47# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=1.0816e+12p ps=1.248e+07u
-M1009 a_734_333# a_533_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1010 Z S[2] a_937_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_3017_47# S[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1012 a_2402_47# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1013 a_1562_333# a_1361_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1014 a_746_47# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1015 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1016 VPWR D[3] a_1562_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_2601_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1018 Z S[4] a_1765_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Z a_184_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_533_47# S[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1021 a_945_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1022 Z a_1012_265# a_945_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR S[0] a_184_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1024 a_2189_47# S[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1025 VPWR S[2] a_1012_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1026 Z a_2668_265# a_2601_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1361_47# S[3] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1028 a_533_47# S[1] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1029 VGND S[0] a_184_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1030 a_2390_333# a_2189_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1031 a_3230_47# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1032 VGND D[1] a_746_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Z S[6] a_2593_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR S[6] a_2668_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1035 VPWR D[1] a_734_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR D[5] a_2390_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_2189_47# S[5] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1038 VPWR S[4] a_1840_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1039 VGND D[3] a_1574_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_109_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1041 VGND D[5] a_2402_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VGND S[2] a_1012_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1043 VGND D[7] a_3230_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 Z S[0] a_109_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_3218_333# a_3017_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VGND S[4] a_1840_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1047 a_3017_47# S[7] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
+X0 VPWR S[1] a_533_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND D[2] a_937_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_1840_265# S[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_1012_265# S[2] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X4 VGND D[4] a_1765_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_3218_333# D[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_2402_47# D[5] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND S[7] a_3017_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X8 VPWR D[4] a_1773_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Z S[7] a_3230_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X10 a_2390_333# D[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_1574_47# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_1765_47# S[4] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X13 a_1012_265# S[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 VPWR D[0] a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_109_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X16 a_2593_47# S[6] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X17 VPWR D[2] a_945_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VPWR S[5] a_2189_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_2668_265# S[6] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X20 VPWR S[7] a_3017_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR S[3] a_1361_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 Z a_3017_47# a_3218_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X23 a_117_297# a_184_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X24 Z a_533_47# a_734_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X25 a_184_265# S[0] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X26 VGND S[3] a_1361_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X27 VGND S[1] a_533_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X28 a_1562_333# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 Z a_2189_47# a_2390_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X30 VGND S[5] a_2189_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X31 a_2601_297# a_2668_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X32 Z S[5] a_2402_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X33 a_945_297# a_1012_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X34 VGND D[0] a_109_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X35 Z a_1361_47# a_1562_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X36 a_937_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X37 a_1773_297# a_1840_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X38 Z S[3] a_1574_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X39 a_2668_265# S[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X40 Z S[1] a_746_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X41 a_734_333# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X42 VGND D[6] a_2593_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X43 a_184_265# S[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X44 a_746_47# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X45 a_1840_265# S[4] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X46 a_3230_47# D[7] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X47 VPWR D[6] a_2601_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.cdl b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.cdl
index baa4279..b172654 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.cdl
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.cdl
@@ -18,100 +18,100 @@
 *.PININFO D[7]:I D[6]:I D[5]:I D[4]:I D[3]:I D[2]:I D[1]:I D[0]:I
 *.PININFO S[7]:I S[6]:I S[5]:I S[4]:I S[3]:I S[2]:I S[1]:I S[0]:I
 *.PININFO VGND:I VNB:I VPB:I VPWR:I Z:O
-MMNA00 Z S[0] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Z S[0] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 net87 D[0] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA01 net87 D[0] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 SB0 S[0] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 Z S[2] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net51 D[2] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 SB2 S[2] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 SB3 S[3] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 net63 D[3] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Z S[3] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Z S[1] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net75 D[1] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 SB1 S[1] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI67 Z S[4] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI66 net073 D[4] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI65 SB4 S[4] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI64 Z S[6] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI63 net085 D[6] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI62 SB6 S[6] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI61 SB7 S[7] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI60 net097 D[7] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI59 Z S[7] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI58 Z S[5] VNB nshort m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI57 net0109 D[5] VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN1 SB0 S[0] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI56 SB5 S[5] VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI30 Z S[2] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 net99 SB2 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 SB2 S[2] 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
-MMPA00 VPWR D[0] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 net135 SB0 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI29 net51 D[2] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 SB3 S[3] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI28 SB2 S[2] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net111 SB3 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI27 SB3 S[3] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 VPWR D[3] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 SB0 S[0] 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
-MI15 net123 SB1 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 VPWR D[1] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 SB1 S[1] VPB 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
-MI36 VPWR D[2] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI79 net0165 SB6 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI26 net63 D[3] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI78 SB6 S[6] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI25 Z S[3] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI77 VPWR D[4] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI13 Z S[1] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI76 net0177 SB4 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI12 net75 D[1] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI75 SB7 S[7] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI11 SB1 S[1] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI74 net0185 SB7 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI67 Z S[4] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI66 net073 D[4] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI73 VPWR D[7] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI65 SB4 S[4] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI72 SB4 S[4] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI64 Z S[6] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI71 net0197 SB5 VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI63 net085 D[6] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI70 VPWR D[5] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI62 SB6 S[6] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI69 SB5 S[5] VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI61 SB7 S[7] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI68 VPWR D[6] VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI60 net097 D[7] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI59 Z S[7] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI58 Z S[5] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI57 net0109 D[5] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI56 SB5 S[5] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI35 net99 SB2 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 SB2 S[2] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR D[0] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 net135 SB0 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 SB3 S[3] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net111 SB3 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 VPWR D[3] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 SB0 S[0] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 net123 SB1 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 VPWR D[1] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 SB1 S[1] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 VPWR D[2] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI79 net0165 SB6 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI78 SB6 S[6] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI77 VPWR D[4] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI76 net0177 SB4 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI75 SB7 S[7] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI74 net0185 SB7 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI73 VPWR D[7] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI72 SB4 S[4] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI71 net0197 SB5 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI70 VPWR D[5] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI69 SB5 S[5] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI68 VPWR D[6] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__muxb8to1_2
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.netlist.tsv b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.netlist.tsv
index 507fc2b..96823ea 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.netlist.tsv
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.netlist.tsv
@@ -1,50 +1,50 @@
 sky130_fd_sc_hdll__muxb8to1_2	D[7]:I D[6]:I D[5]:I D[4]:I D[3]:I D[2]:I D[1]:I D[0]:I S[7]:I S[6]:I S[5]:I S[4]:I S[3]:I S[2]:I S[1]:I S[0]: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
-MMNA00	MOSFET	Z	S[0]	net87	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	net87	D[0]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	SB0	S[0]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	Z	S[2]	net51	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net51	D[2]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	SB2	S[2]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	SB3	S[3]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net63	D[3]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Z	S[3]	net63	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Z	S[1]	net75	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net75	D[1]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	SB1	S[1]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI67	MOSFET	Z	S[4]	net073	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI66	MOSFET	net073	D[4]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI65	MOSFET	SB4	S[4]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI64	MOSFET	Z	S[6]	net085	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI63	MOSFET	net085	D[6]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI62	MOSFET	SB6	S[6]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI61	MOSFET	SB7	S[7]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI60	MOSFET	net097	D[7]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI59	MOSFET	Z	S[7]	net097	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI58	MOSFET	Z	S[5]	net0109	VNB	nshort	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI57	MOSFET	net0109	D[5]	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI56	MOSFET	SB5	S[5]	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI35	MOSFET	net99	SB2	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	SB2	S[2]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	D[0]	net135	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	net135	SB0	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	SB3	S[3]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net111	SB3	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	VPWR	D[3]	net111	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	SB0	S[0]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net123	SB1	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	VPWR	D[1]	net123	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	SB1	S[1]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	VPWR	D[2]	net99	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI79	MOSFET	net0165	SB6	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI78	MOSFET	SB6	S[6]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI77	MOSFET	VPWR	D[4]	net0177	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI76	MOSFET	net0177	SB4	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI75	MOSFET	SB7	S[7]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI74	MOSFET	net0185	SB7	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI73	MOSFET	VPWR	D[7]	net0185	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI72	MOSFET	SB4	S[4]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI71	MOSFET	net0197	SB5	Z	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI70	MOSFET	VPWR	D[5]	net0197	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI69	MOSFET	SB5	S[5]	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI68	MOSFET	VPWR	D[6]	net0165	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Z	S[0]	net87	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	net87	D[0]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	SB0	S[0]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	Z	S[2]	net51	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net51	D[2]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	SB2	S[2]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	SB3	S[3]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net63	D[3]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Z	S[3]	net63	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Z	S[1]	net75	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net75	D[1]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	SB1	S[1]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI67	MOSFET	Z	S[4]	net073	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI66	MOSFET	net073	D[4]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI65	MOSFET	SB4	S[4]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI64	MOSFET	Z	S[6]	net085	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI63	MOSFET	net085	D[6]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI62	MOSFET	SB6	S[6]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI61	MOSFET	SB7	S[7]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI60	MOSFET	net097	D[7]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI59	MOSFET	Z	S[7]	net097	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI58	MOSFET	Z	S[5]	net0109	VNB	nfet_01v8	2	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI57	MOSFET	net0109	D[5]	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI56	MOSFET	SB5	S[5]	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI35	MOSFET	net99	SB2	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	SB2	S[2]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	D[0]	net135	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	net135	SB0	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	SB3	S[3]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net111	SB3	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	VPWR	D[3]	net111	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	SB0	S[0]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net123	SB1	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	VPWR	D[1]	net123	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	SB1	S[1]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	VPWR	D[2]	net99	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI79	MOSFET	net0165	SB6	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI78	MOSFET	SB6	S[6]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI77	MOSFET	VPWR	D[4]	net0177	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI76	MOSFET	net0177	SB4	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI75	MOSFET	SB7	S[7]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI74	MOSFET	net0185	SB7	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI73	MOSFET	VPWR	D[7]	net0185	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI72	MOSFET	SB4	S[4]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI71	MOSFET	net0197	SB5	Z	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI70	MOSFET	VPWR	D[5]	net0197	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI69	MOSFET	SB5	S[5]	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI68	MOSFET	VPWR	D[6]	net0165	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.spice b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.spice
index 52db852..57fb73f 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.spice
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.spice
@@ -17,164 +17,84 @@
 
 .subckt sky130_fd_sc_hdll__muxb8to1_2 D[7] D[6] D[5] D[4] D[3] D[2] D[1] D[0] S[7]
 + S[6] S[5] S[4] S[3] S[2] S[1] S[0] VGND VNB VPB VPWR Z
-M1000 VPWR D[2] a_1315_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.76e+12p pd=3.152e+07u as=8.211e+11p ps=7.41e+06u
-M1001 VPWR D[3] a_2112_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1002 VPWR S[4] a_2854_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1003 a_27_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1004 Z a_1566_265# a_1315_297# VPB phighvt w=820000u l=180000u
-+  ad=1.9024e+12p pd=1.776e+07u as=0p ps=0u
-M1005 Z a_1989_47# a_2112_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_297# a_278_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_4565_47# S[7] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=1.9656e+12p ps=2.104e+07u
-M1008 VPWR S[0] a_278_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1009 a_1989_47# S[3] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1010 Z S[5] a_3421_69# VNB nshort w=520000u l=150000u
-+  ad=1.1232e+12p pd=1.264e+07u as=5.6745e+11p ps=5.52e+06u
-M1011 a_4709_69# D[7] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1012 a_2133_69# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1013 Z a_278_265# a_27_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_2603_297# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1015 a_845_69# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1016 a_2603_297# a_2854_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1018 Z S[1] a_845_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Z S[0] a_27_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Z S[4] a_2603_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1022 a_824_333# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1023 a_1989_47# S[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1024 a_3400_333# a_3277_47# Z VPB phighvt w=820000u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1025 a_3400_333# D[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_3421_69# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND D[7] a_4709_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_3277_47# S[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1029 a_3891_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1030 a_4688_333# D[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1031 VGND D[4] a_2603_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND S[4] a_2854_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1033 a_3891_297# a_4142_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR D[0] a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_701_47# S[1] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1036 VGND D[1] a_845_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR D[4] a_2603_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR D[5] a_3400_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR S[6] a_4142_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1040 a_824_333# a_701_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 Z a_2854_265# a_2603_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 Z a_3277_47# a_3400_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND S[0] a_278_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1044 a_2603_47# S[4] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_701_47# S[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1046 Z a_4142_265# a_3891_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND D[5] a_3421_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_2603_47# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VPWR D[1] a_824_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 a_3277_47# S[5] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1051 a_845_69# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 Z S[3] a_2133_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 VGND D[0] a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 a_3421_69# D[5] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 Z S[7] a_4709_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 Z a_701_47# a_824_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 a_1315_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1058 Z S[2] a_1315_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 Z S[6] a_3891_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1060 a_1315_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1061 a_1315_297# a_1566_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 a_2112_333# a_1989_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 VGND D[2] a_1315_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 a_4688_333# a_4565_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 a_2133_69# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 a_4565_47# S[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1067 VPWR S[2] a_1566_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1068 a_2112_333# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 VPWR D[7] a_4688_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 VGND D[6] a_3891_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1071 a_4709_69# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1072 VPWR D[6] a_3891_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1073 Z a_4565_47# a_4688_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1074 a_3891_47# S[6] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1075 VGND S[6] a_4142_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1076 a_1315_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 VGND S[2] a_1566_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1078 VGND D[3] a_2133_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1079 a_3891_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1315_47# D[2] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_2603_47# D[4] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_3891_47# D[6] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_2112_333# a_1989_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X4 VPWR D[5] a_3400_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_3891_47# S[6] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X6 Z a_278_265# a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X7 Z S[0] a_27_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X8 a_845_69# S[1] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X9 VPWR D[3] a_2112_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_27_297# D[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 Z a_4142_265# a_3891_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X12 VGND D[1] a_845_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VGND D[3] a_2133_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VGND D[5] a_3421_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_1566_265# S[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VGND S[5] a_3277_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X17 VGND S[7] a_4565_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X18 Z a_701_47# a_824_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X19 a_4688_333# D[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VGND D[6] a_3891_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 a_845_69# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_2133_69# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 a_3421_69# D[5] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 VPWR S[1] a_701_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 a_824_333# a_701_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X26 a_27_297# a_278_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X27 VPWR D[4] a_2603_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 a_3400_333# D[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 a_3891_297# D[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 Z S[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X31 Z S[4] a_2603_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X32 a_2854_265# S[4] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X33 a_4142_265# S[6] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X34 a_27_47# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X35 VGND S[1] a_701_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X36 a_278_265# S[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X37 a_2112_333# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X38 Z a_4565_47# a_4688_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X39 VPWR D[1] a_824_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X40 VPWR D[2] a_1315_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X41 a_2603_297# D[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X42 VGND D[0] a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X43 a_27_47# D[0] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X44 a_1315_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X45 VPWR S[7] a_4565_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X46 Z S[3] a_2133_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X47 a_2603_47# S[4] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X48 a_824_333# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X49 a_1315_297# D[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X50 Z a_3277_47# a_3400_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X51 a_3891_297# a_4142_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X52 Z S[5] a_3421_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X53 Z S[7] a_4709_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X54 VGND D[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X55 a_4709_69# D[7] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X56 VPWR S[5] a_3277_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X57 a_4142_265# S[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X58 a_2133_69# S[3] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X59 a_3421_69# S[5] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X60 a_4709_69# S[7] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X61 VPWR D[0] a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X62 a_2854_265# S[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X63 Z S[1] a_845_69# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X64 VGND D[7] a_4709_69# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X65 Z a_2854_265# a_2603_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X66 VPWR D[7] a_4688_333# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X67 VGND S[3] a_1989_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X68 a_2603_297# a_2854_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X69 a_278_265# S[0] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X70 a_4688_333# a_4565_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X71 Z a_1566_265# a_1315_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X72 VGND D[4] a_2603_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X73 VPWR S[3] a_1989_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X74 VPWR D[6] a_3891_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X75 a_1315_297# a_1566_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X76 a_3400_333# a_3277_47# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X77 a_1566_265# S[2] VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X78 Z S[6] a_3891_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X79 Z a_1989_47# a_2112_333# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
 .ends
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.cdl b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.cdl
index 2ca3cf0..489e37e 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.cdl
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.cdl
@@ -18,100 +18,100 @@
 *.PININFO D[7]:I D[6]:I D[5]:I D[4]:I D[3]:I D[2]:I D[1]:I D[0]:I
 *.PININFO S[7]:I S[6]:I S[5]:I S[4]:I S[3]:I S[2]:I S[1]:I S[0]:I
 *.PININFO VGND:I VNB:I VPB:I VPWR:I Z:O
-MMNA00 Z S[0] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Z S[0] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 net87 D[0] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA01 net87 D[0] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 SB0 S[0] 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
-MI30 Z S[2] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net51 D[2] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 SB2 S[2] VNB 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
-MI27 SB3 S[3] 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
-MI26 net63 D[3] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Z S[3] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Z S[1] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net75 D[1] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 SB1 S[1] VNB 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
-MI67 Z S[4] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI66 net073 D[4] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI65 SB4 S[4] VNB 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
-MI64 Z S[6] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI63 net085 D[6] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI62 SB6 S[6] VNB 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
-MI61 SB7 S[7] 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
-MI60 net097 D[7] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI59 Z S[7] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI58 Z S[5] VNB nshort m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI57 net0109 D[5] VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN1 SB0 S[0] 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
-MI56 SB5 S[5] VNB nshort m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI30 Z S[2] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 net99 SB2 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 SB2 S[2] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR D[0] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 net135 SB0 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI29 net51 D[2] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 SB3 S[3] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI28 SB2 S[2] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net111 SB3 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI27 SB3 S[3] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 VPWR D[3] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 SB0 S[0] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net123 SB1 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 VPWR D[1] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 SB1 S[1] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 VPWR D[2] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI79 net0165 SB6 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI26 net63 D[3] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI78 SB6 S[6] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI25 Z S[3] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI77 VPWR D[4] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI13 Z S[1] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI76 net0177 SB4 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI12 net75 D[1] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI75 SB7 S[7] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI11 SB1 S[1] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI74 net0185 SB7 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI67 Z S[4] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI66 net073 D[4] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI73 VPWR D[7] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI65 SB4 S[4] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI72 SB4 S[4] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI64 Z S[6] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI71 net0197 SB5 VPB phighvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI63 net085 D[6] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI70 VPWR D[5] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI62 SB6 S[6] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI69 SB5 S[5] VPB phighvt m=2 w=0.82 l=0.18 mult=1 sa=0.265 sb=0.265
+MI61 SB7 S[7] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI68 VPWR D[6] VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI60 net097 D[7] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI59 Z S[7] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI58 Z S[5] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI57 net0109 D[5] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI56 SB5 S[5] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI35 net99 SB2 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 SB2 S[2] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR D[0] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 net135 SB0 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 SB3 S[3] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net111 SB3 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 VPWR D[3] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 SB0 S[0] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 net123 SB1 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 VPWR D[1] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 SB1 S[1] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 VPWR D[2] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI79 net0165 SB6 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI78 SB6 S[6] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI77 VPWR D[4] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI76 net0177 SB4 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI75 SB7 S[7] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI74 net0185 SB7 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI73 VPWR D[7] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI72 SB4 S[4] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI71 net0197 SB5 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI70 VPWR D[5] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI69 SB5 S[5] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI68 VPWR D[6] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__muxb8to1_4
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.netlist.tsv b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.netlist.tsv
index 0c35571..c97800c 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.netlist.tsv
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.netlist.tsv
@@ -1,50 +1,50 @@
 sky130_fd_sc_hdll__muxb8to1_4	D[7]:I D[6]:I D[5]:I D[4]:I D[3]:I D[2]:I D[1]:I D[0]:I S[7]:I S[6]:I S[5]:I S[4]:I S[3]:I S[2]:I S[1]:I S[0]: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
-MMNA00	MOSFET	Z	S[0]	net87	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	net87	D[0]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	SB0	S[0]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	Z	S[2]	net51	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net51	D[2]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	SB2	S[2]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	SB3	S[3]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net63	D[3]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Z	S[3]	net63	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Z	S[1]	net75	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net75	D[1]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	SB1	S[1]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI67	MOSFET	Z	S[4]	net073	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI66	MOSFET	net073	D[4]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI65	MOSFET	SB4	S[4]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI64	MOSFET	Z	S[6]	net085	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI63	MOSFET	net085	D[6]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI62	MOSFET	SB6	S[6]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI61	MOSFET	SB7	S[7]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI60	MOSFET	net097	D[7]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI59	MOSFET	Z	S[7]	net097	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI58	MOSFET	Z	S[5]	net0109	VNB	nshort	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI57	MOSFET	net0109	D[5]	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI56	MOSFET	SB5	S[5]	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI35	MOSFET	net99	SB2	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	SB2	S[2]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	D[0]	net135	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	net135	SB0	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	SB3	S[3]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net111	SB3	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	VPWR	D[3]	net111	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	SB0	S[0]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net123	SB1	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	VPWR	D[1]	net123	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	SB1	S[1]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	VPWR	D[2]	net99	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI79	MOSFET	net0165	SB6	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI78	MOSFET	SB6	S[6]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI77	MOSFET	VPWR	D[4]	net0177	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI76	MOSFET	net0177	SB4	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI75	MOSFET	SB7	S[7]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI74	MOSFET	net0185	SB7	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI73	MOSFET	VPWR	D[7]	net0185	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI72	MOSFET	SB4	S[4]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI71	MOSFET	net0197	SB5	Z	VPB	phighvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI70	MOSFET	VPWR	D[5]	net0197	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI69	MOSFET	SB5	S[5]	VPWR	VPB	phighvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI68	MOSFET	VPWR	D[6]	net0165	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Z	S[0]	net87	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	net87	D[0]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	SB0	S[0]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	Z	S[2]	net51	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net51	D[2]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	SB2	S[2]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	SB3	S[3]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net63	D[3]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Z	S[3]	net63	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Z	S[1]	net75	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net75	D[1]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	SB1	S[1]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI67	MOSFET	Z	S[4]	net073	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI66	MOSFET	net073	D[4]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI65	MOSFET	SB4	S[4]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI64	MOSFET	Z	S[6]	net085	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI63	MOSFET	net085	D[6]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI62	MOSFET	SB6	S[6]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI61	MOSFET	SB7	S[7]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI60	MOSFET	net097	D[7]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI59	MOSFET	Z	S[7]	net097	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI58	MOSFET	Z	S[5]	net0109	VNB	nfet_01v8	4	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI57	MOSFET	net0109	D[5]	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI56	MOSFET	SB5	S[5]	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI35	MOSFET	net99	SB2	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	SB2	S[2]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	D[0]	net135	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	net135	SB0	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	SB3	S[3]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net111	SB3	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	VPWR	D[3]	net111	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	SB0	S[0]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net123	SB1	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	VPWR	D[1]	net123	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	SB1	S[1]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	VPWR	D[2]	net99	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI79	MOSFET	net0165	SB6	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI78	MOSFET	SB6	S[6]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI77	MOSFET	VPWR	D[4]	net0177	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI76	MOSFET	net0177	SB4	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI75	MOSFET	SB7	S[7]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI74	MOSFET	net0185	SB7	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI73	MOSFET	VPWR	D[7]	net0185	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI72	MOSFET	SB4	S[4]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI71	MOSFET	net0197	SB5	Z	VPB	pfet_01v8_hvt	4	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI70	MOSFET	VPWR	D[5]	net0197	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI69	MOSFET	SB5	S[5]	VPWR	VPB	pfet_01v8_hvt	2	0.82	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI68	MOSFET	VPWR	D[6]	net0165	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.spice b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.spice
index 76d41fa..0b8c8fb 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.spice
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.spice
@@ -17,324 +17,164 @@
 
 .subckt sky130_fd_sc_hdll__muxb8to1_4 D[7] D[6] D[5] D[4] D[3] D[2] D[1] D[0] S[7]
 + S[6] S[5] S[4] S[3] S[2] S[1] S[0] VGND VNB VPB VPWR Z
-M1000 a_1313_591# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=9.4224e+12p ps=8.664e+07u
-M1001 VPWR S[0] a_142_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1002 a_3797_297# a_4239_265# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=3.8048e+12p ps=3.552e+07u
-M1003 a_405_66# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=2.2464e+12p ps=2.528e+07u
-M1004 Z a_2626_325# a_2839_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1005 a_3799_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=6.1412e+12p ps=6.128e+07u
-M1006 a_2889_66# S[4] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1007 a_1755_793# S[3] VPWR VPB phighvt w=820000u l=180000u
-+  ad=2.378e+11p pd=2.22e+06u as=0p ps=0u
-M1008 Z S[7] a_3799_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1009 Z S[5] a_2889_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1010 a_355_311# a_142_325# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1011 a_3797_591# a_4239_793# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1012 a_355_311# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND D[2] a_1315_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1014 VGND D[7] a_3799_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1315_911# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1016 Z S[3] a_1315_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_355_613# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1018 VPWR S[5] a_2626_599# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1019 Z a_142_325# a_355_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1315_911# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_2839_613# a_2626_599# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1022 Z S[4] a_2889_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Z a_4239_265# a_3797_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Z S[2] a_1315_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND D[7] a_3799_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_3799_911# D[7] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND D[4] a_2889_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1315_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_405_918# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1030 a_405_918# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Z a_1755_793# a_1313_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_4239_265# S[6] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1033 VGND D[5] a_2889_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_2889_66# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_2889_66# S[4] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1313_591# a_1755_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1315_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Z S[5] a_2889_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_2626_599# S[5] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_142_325# S[0] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 Z a_2626_599# a_2839_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR D[4] a_2839_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND S[0] a_142_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1044 Z S[2] a_1315_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_2889_66# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VPWR D[5] a_2839_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND D[3] a_1315_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_1315_911# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VPWR D[0] a_355_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 Z a_1755_265# a_1313_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1051 Z a_142_325# a_355_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VPWR S[1] a_142_599# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1053 Z a_4239_793# a_3797_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 a_355_613# a_142_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 VPWR D[1] a_355_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 a_2839_613# a_2626_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 a_1315_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 Z S[1] a_405_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 VGND D[1] a_405_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 VGND S[3] a_1755_793# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1061 VGND S[6] a_4239_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 a_2839_311# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 a_3799_911# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 VPWR S[6] a_4239_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1065 a_405_66# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 Z S[4] a_2889_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1067 a_142_325# S[0] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1068 a_405_918# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 VGND D[2] a_1315_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 a_2839_613# D[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1071 VPWR D[2] a_1313_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1072 VPWR S[2] a_1755_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1073 a_1313_297# a_1755_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1074 VGND S[5] a_2626_599# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1075 a_3797_591# a_4239_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1076 VPWR D[3] a_1313_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 a_2889_918# D[5] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1078 Z a_2626_599# a_2839_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1079 VGND D[4] a_2889_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1080 a_355_613# a_142_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1081 VGND D[6] a_3799_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1082 a_3797_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1083 a_405_918# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1084 a_142_599# S[1] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1085 a_4239_265# S[6] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1086 a_355_311# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1087 a_3797_591# D[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1088 a_142_599# S[1] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1089 a_3799_47# S[6] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1090 a_1313_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1091 a_3799_911# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1092 Z a_142_599# a_355_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1093 a_355_613# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1094 VGND S[2] a_1755_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1095 a_1313_591# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1096 Z a_4239_793# a_3797_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1097 VGND D[0] a_405_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1098 a_3799_911# D[7] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1099 a_3797_297# a_4239_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1100 a_405_66# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1101 Z S[6] a_3799_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1102 Z S[1] a_405_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1103 a_1755_265# S[2] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1104 a_1315_911# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1105 VPWR D[4] a_2839_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1106 VGND D[5] a_2889_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1107 a_2889_918# D[5] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1108 VPWR D[6] a_3797_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1109 Z S[0] a_405_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1110 a_2839_311# a_2626_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1111 a_3799_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1112 a_2889_918# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1113 VPWR D[5] a_2839_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1114 a_4239_793# S[7] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1115 a_1755_265# S[2] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1116 Z a_1755_265# a_1313_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1117 VPWR D[7] a_3797_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1118 VPWR D[2] a_1313_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1119 VPWR S[7] a_4239_793# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1120 VPWR D[3] a_1313_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1121 VGND S[4] a_2626_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1122 a_3799_47# S[6] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1123 Z a_142_599# a_355_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1124 Z a_1755_793# a_1313_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1125 VPWR S[3] a_1755_793# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1126 a_1313_297# a_1755_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1127 a_2839_311# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1128 VPWR S[4] a_2626_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1129 a_2626_325# S[4] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1130 a_3797_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1131 Z a_2626_325# a_2839_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1132 Z S[6] a_3799_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1133 Z S[0] a_405_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1134 a_2839_613# D[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1135 Z S[3] a_1315_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1136 VGND D[3] a_1315_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1137 VPWR D[0] a_355_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1138 VGND S[1] a_142_599# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1139 a_3797_591# D[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1140 a_1755_793# S[3] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1141 VPWR D[1] a_355_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1142 a_2889_918# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1143 Z a_4239_265# a_3797_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1144 Z S[7] a_3799_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1145 VPWR D[6] a_3797_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1146 a_2839_311# a_2626_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1147 a_355_311# a_142_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1148 a_4239_793# S[7] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1149 VGND S[7] a_4239_793# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1150 a_1315_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1151 VGND D[0] a_405_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1152 a_1313_591# a_1755_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1153 VPWR D[7] a_3797_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1154 a_2626_599# S[5] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1155 a_2626_325# S[4] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1156 a_405_66# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1157 VGND D[1] a_405_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1158 a_1313_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1159 VGND D[6] a_3799_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND D[4] a_2889_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_1313_297# D[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VGND D[3] a_1315_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_355_613# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_3797_297# a_4239_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X5 VPWR S[6] a_4239_265# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X6 a_1313_591# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VPWR D[2] a_1313_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR D[5] a_2839_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR D[1] a_355_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_4239_793# S[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X11 a_1755_793# S[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X12 a_2839_613# a_2626_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X13 VPWR D[7] a_3797_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 Z S[0] a_405_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X15 a_142_599# S[1] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 Z a_142_325# a_355_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X17 a_1315_911# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 VGND D[3] a_1315_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 Z a_2626_599# a_2839_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X20 a_2626_599# S[5] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 VPWR S[3] a_1755_793# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X22 a_3797_591# D[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 Z S[3] a_1315_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X24 Z S[7] a_3799_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X25 a_355_311# a_142_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X26 a_1313_297# a_1755_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X27 Z a_142_325# a_355_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X28 Z a_4239_793# a_3797_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X29 a_1755_793# S[3] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 VGND S[2] a_1755_265# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_3799_911# S[7] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X32 a_142_325# S[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X33 a_405_66# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X34 a_3799_47# S[6] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X35 a_405_66# D[0] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X36 a_2839_311# a_2626_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X37 a_355_311# D[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X38 a_1315_911# D[3] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X39 a_355_311# a_142_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X40 a_3797_591# a_4239_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X41 a_3799_911# D[7] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X42 VPWR S[0] a_142_325# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X43 a_2839_613# D[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X44 VGND D[5] a_2889_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X45 VPWR D[4] a_2839_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X46 a_1313_297# D[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X47 a_355_613# D[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X48 VPWR S[5] a_2626_599# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X49 a_3799_47# S[6] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X50 a_405_66# D[0] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X51 VPWR D[0] a_355_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X52 VPWR D[6] a_3797_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X53 a_3799_47# D[6] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X54 a_1315_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X55 VGND S[0] a_142_325# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X56 VPWR D[1] a_355_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X57 VGND D[4] a_2889_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X58 Z a_4239_265# a_3797_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X59 Z S[0] a_405_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X60 Z a_142_599# a_355_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X61 a_3799_911# D[7] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X62 VGND D[0] a_405_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X63 VPWR D[7] a_3797_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X64 VPWR D[3] a_1313_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X65 a_3797_297# D[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X66 Z S[1] a_405_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X67 VPWR S[7] a_4239_793# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X68 a_355_613# a_142_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X69 a_1313_591# a_1755_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X70 Z a_142_599# a_355_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X71 Z a_2626_325# a_2839_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X72 VGND S[1] a_142_599# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X73 VGND S[5] a_2626_599# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X74 a_2839_613# a_2626_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X75 a_3799_911# S[7] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X76 a_2626_325# S[4] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X77 a_355_613# a_142_599# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X78 a_2839_311# D[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X79 a_1315_911# S[3] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X80 a_405_918# S[1] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X81 VGND S[3] a_1755_793# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X82 Z a_1755_265# a_1313_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X83 a_355_311# D[0] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X84 a_2626_325# S[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X85 a_405_918# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X86 a_2889_66# S[4] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X87 a_1315_47# D[2] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X88 VGND D[1] a_405_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X89 a_142_599# S[1] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X90 a_1313_297# a_1755_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X91 VPWR D[0] a_355_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X92 Z a_4239_793# a_3797_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X93 VPWR D[6] a_3797_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X94 VPWR D[5] a_2839_613# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X95 VPWR D[2] a_1313_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X96 Z S[1] a_405_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X97 VPWR S[1] a_142_599# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X98 Z S[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X99 Z a_1755_265# a_1313_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X100 Z S[5] a_2889_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X101 a_142_325# S[0] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X102 VGND D[0] a_405_66# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X103 a_4239_265# S[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X104 a_405_918# D[1] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X105 VGND D[7] a_3799_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X106 VGND D[6] a_3799_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X107 Z S[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X108 a_1755_265# S[2] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X109 a_2839_613# D[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X110 a_3797_297# a_4239_265# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X111 a_1315_47# D[2] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X112 VGND D[5] a_2889_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X113 VGND D[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X114 Z a_2626_599# a_2839_613# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X115 a_405_66# S[0] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X116 a_3797_591# D[7] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X117 a_1315_911# S[3] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X118 a_1313_591# D[3] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X119 a_405_918# S[1] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X120 VPWR S[2] a_1755_265# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X121 VGND S[7] a_4239_793# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X122 a_2889_918# S[5] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X123 Z a_1755_793# a_1313_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X124 a_2889_66# S[4] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X125 a_2889_918# S[5] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X126 VPWR D[3] a_1313_591# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X127 a_4239_265# S[6] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X128 a_2839_311# a_2626_325# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X129 a_2889_918# D[5] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X130 VGND D[7] a_3799_911# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X131 VGND D[6] a_3799_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X132 a_1755_265# S[2] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X133 a_1315_47# S[2] Z VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X134 VGND D[2] a_1315_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X135 a_1313_591# a_1755_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X136 Z S[3] a_1315_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X137 a_2889_66# D[4] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X138 Z S[4] a_2889_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X139 Z S[7] a_3799_911# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X140 Z S[6] a_3799_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X141 VGND S[4] a_2626_325# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X142 VPWR D[4] a_2839_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X143 Z a_2626_325# a_2839_311# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X144 a_4239_793# S[7] VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X145 VGND D[1] a_405_918# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X146 VPWR S[4] a_2626_325# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X147 Z a_1755_793# a_1313_591# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X148 Z S[4] a_2889_66# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X149 Z S[6] a_3799_47# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X150 a_3799_47# D[6] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X151 a_2839_311# D[4] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X152 a_2626_599# S[5] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X153 VGND S[6] a_4239_265# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X154 Z a_4239_265# a_3797_297# VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X155 a_2889_918# D[5] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X156 a_3797_591# a_4239_793# Z VPB sky130_fd_pr__pfet_01v8_hvt w=820000u l=180000u
+X157 Z S[5] a_2889_918# VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X158 a_3797_297# D[6] VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X159 a_2889_66# D[4] VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_1.cdl b/cells/nand2/sky130_fd_sc_hdll__nand2_1.cdl
index a1db521..fc307c9 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_1.cdl
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2_1 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB 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
-MMP1 Y B 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
-MMN0 Y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2_1
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_1.netlist.tsv b/cells/nand2/sky130_fd_sc_hdll__nand2_1.netlist.tsv
index 0631f30..048dfac 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_1.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_1.spice b/cells/nand2/sky130_fd_sc_hdll__nand2_1.spice
index ed563db..dd54e56 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_1.spice
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_hdll__nand2_1 A B VGND VNB VPB VPWR Y
-M1000 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=5.4e+11p ps=5.08e+06u
-M1001 Y A a_123_47# VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=1.755e+11p ps=1.84e+06u
-M1002 a_123_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1003 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B a_123_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_123_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_12.cdl b/cells/nand2/sky130_fd_sc_hdll__nand2_12.cdl
index d5bf57c..befc1c0 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_12.cdl
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_12.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2_12 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=12 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=12 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=12 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=12 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=12 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=12 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2_12
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_12.netlist.tsv b/cells/nand2/sky130_fd_sc_hdll__nand2_12.netlist.tsv
index 898d916..38cda98 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_12.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_12.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__nand2_12	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	12	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	12	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	12	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	12	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	12	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	12	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	12	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	12	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_12.spice b/cells/nand2/sky130_fd_sc_hdll__nand2_12.spice
index c391598..7c9db66 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_12.spice
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_12.spice
@@ -16,100 +16,52 @@
 
 
 .subckt sky130_fd_sc_hdll__nand2_12 A B VGND VNB VPB VPWR Y
-M1000 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=3.73e+12p pd=3.346e+07u as=3.48e+12p ps=3.096e+07u
-M1001 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=2.3335e+12p pd=2.408e+07u as=1.443e+12p ps=1.224e+07u
-M1004 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=1.378e+12p pd=1.204e+07u as=0p ps=0u
-M1008 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X28 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X33 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X34 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X35 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X36 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X37 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X38 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X39 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X40 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X41 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X42 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X43 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X44 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X45 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X46 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X47 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_16.cdl b/cells/nand2/sky130_fd_sc_hdll__nand2_16.cdl
index 7a3dfa8..2d8cae4 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_16.cdl
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_16.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2_16 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=16 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=16 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2_16
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_16.netlist.tsv b/cells/nand2/sky130_fd_sc_hdll__nand2_16.netlist.tsv
index b69d562..3115ea3 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_16.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_16.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__nand2_16	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	16	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	16	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	16	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	16	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	16	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	16	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	16	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	16	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_16.spice b/cells/nand2/sky130_fd_sc_hdll__nand2_16.spice
index c638df4..75dd8e3 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_16.spice
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_16.spice
@@ -16,132 +16,68 @@
 
 
 .subckt sky130_fd_sc_hdll__nand2_16 A B VGND VNB VPB VPWR Y
-M1000 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=4.89e+12p pd=4.378e+07u as=4.64e+12p ps=4.128e+07u
-M1001 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=1.859e+12p pd=1.612e+07u as=3.0355e+12p ps=3.144e+07u
-M1002 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.924e+12p ps=1.632e+07u
-M1005 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1061 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X32 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X33 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X34 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X35 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X36 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X37 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X38 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X39 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X40 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X41 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X42 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X43 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X44 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X45 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X46 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X47 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X48 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X49 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X50 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X51 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X52 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X53 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X54 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X55 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X56 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X57 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X58 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X59 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X60 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X61 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X62 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X63 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_2.cdl b/cells/nand2/sky130_fd_sc_hdll__nand2_2.cdl
index af33c81..13062a9 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_2.cdl
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2_2 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2_2
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_2.netlist.tsv b/cells/nand2/sky130_fd_sc_hdll__nand2_2.netlist.tsv
index 98403d6..c6effb0 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_2.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_2.spice b/cells/nand2/sky130_fd_sc_hdll__nand2_2.spice
index 471de2d..719e71b 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_2.spice
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_2.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__nand2_2 A B VGND VNB VPB VPWR Y
-M1000 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=8.3e+11p pd=7.66e+06u as=5.8e+11p ps=5.16e+06u
-M1001 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=5.135e+11p pd=5.48e+06u as=2.405e+11p ps=2.04e+06u
-M1002 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=2.405e+11p pd=2.04e+06u as=0p ps=0u
-M1003 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_4.cdl b/cells/nand2/sky130_fd_sc_hdll__nand2_4.cdl
index 6fa2e04..f703492 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_4.cdl
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2_4 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2_4
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_4.netlist.tsv b/cells/nand2/sky130_fd_sc_hdll__nand2_4.netlist.tsv
index e863e15..e3288db 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_4.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_4.spice b/cells/nand2/sky130_fd_sc_hdll__nand2_4.spice
index 2b846e7..3e44ab2 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_4.spice
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_4.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__nand2_4 A B VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.41e+12p pd=1.282e+07u as=1.16e+12p ps=1.032e+07u
-M1001 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=9.62e+11p pd=9.46e+06u as=4.16e+11p ps=3.88e+06u
-M1003 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.485e+11p ps=3.98e+06u
-M1006 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_6.cdl b/cells/nand2/sky130_fd_sc_hdll__nand2_6.cdl
index 5add757..dc9a9b4 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_6.cdl
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_6.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2_6 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2_6
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_6.netlist.tsv b/cells/nand2/sky130_fd_sc_hdll__nand2_6.netlist.tsv
index b65118c..dfb3540 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_6.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_6.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__nand2_6	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	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_6.spice b/cells/nand2/sky130_fd_sc_hdll__nand2_6.spice
index b62d385..ef3bdaf 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_6.spice
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_6.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__nand2_6 A B VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.99e+12p pd=1.798e+07u as=1.74e+12p ps=1.548e+07u
-M1001 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=1.248e+12p pd=1.294e+07u as=7.215e+11p ps=6.12e+06u
-M1003 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=6.89e+11p pd=6.02e+06u as=0p ps=0u
-M1006 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_8.cdl b/cells/nand2/sky130_fd_sc_hdll__nand2_8.cdl
index dcaf450..efe3a3f 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_8.cdl
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2_8 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2_8
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_8.netlist.tsv b/cells/nand2/sky130_fd_sc_hdll__nand2_8.netlist.tsv
index 93926ff..d1a696a 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_8.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	8	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_8.spice b/cells/nand2/sky130_fd_sc_hdll__nand2_8.spice
index 9f39ab9..29ea52f 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_8.spice
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_8.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hdll__nand2_8 A B VGND VNB VPB VPWR Y
-M1000 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=2.69e+12p pd=2.338e+07u as=2.32e+12p ps=2.064e+07u
-M1001 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=1.8395e+12p pd=1.736e+07u as=8.645e+11p ps=7.86e+06u
-M1006 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=8.645e+11p pd=7.86e+06u as=0p ps=0u
-M1009 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 a_27_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.cdl b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.cdl
index aea4489..cd688f4 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.cdl
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2b_1 A_N B VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB 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
-MMP1 Y B 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2b_1
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.netlist.tsv b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.netlist.tsv
index 8bd4271..6e2b1d5 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.netlist.tsv
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.65	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_hdll__nand2b_1.spice b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.spice
index 9a28a36..04ef28f 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.spice
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hdll__nand2b_1 A_N B VGND VNB VPB VPWR Y
-M1000 VPWR A_N a_27_93# VPB phighvt w=420000u l=180000u
-+  ad=5.757e+11p pd=5.25e+06u as=1.134e+11p ps=1.38e+06u
-M1001 VPWR a_27_93# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1002 VGND A_N a_27_93# VNB nshort w=420000u l=150000u
-+  ad=2.33e+11p pd=2.07e+06u as=1.302e+11p ps=1.46e+06u
-M1003 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y a_27_93# a_226_47# VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=1.755e+11p ps=1.84e+06u
-M1005 a_226_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_93# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VGND B a_226_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_27_93# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y a_27_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_226_47# a_27_93# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.cdl b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.cdl
index 8543e69..0b29241 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.cdl
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2b_2 A_N B VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 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=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2b_2
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.netlist.tsv b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.netlist.tsv
index d56f0a7..2bce35b 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.netlist.tsv
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	2	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	2	0.65	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_hdll__nand2b_2.spice b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.spice
index 07c0866..927e8f1 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.spice
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__nand2b_2 A_N B VGND VNB VPB VPWR Y
-M1000 a_215_47# a_27_93# Y VNB nshort w=650000u l=150000u
-+  ad=5.135e+11p pd=5.48e+06u as=1.755e+11p ps=1.84e+06u
-M1001 VPWR a_27_93# Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.0628e+12p pd=8.23e+06u as=6.5e+11p ps=5.3e+06u
-M1002 Y a_27_93# a_215_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_215_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.172e+11p ps=3.3e+06u
-M1004 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B a_215_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A_N a_27_93# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1007 Y a_27_93# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A_N a_27_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
+X0 a_215_47# a_27_93# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_27_93# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 VGND B a_215_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 Y a_27_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_27_93# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_215_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VPWR a_27_93# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Y a_27_93# a_215_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.cdl b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.cdl
index 72d4fa6..057f942 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.cdl
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2b_4 A_N B VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2b_4
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.netlist.tsv b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.netlist.tsv
index 4c53578..a6850b1 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.netlist.tsv
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	4	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.spice b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.spice
index ec8c884..ff5dc35 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.spice
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_hdll__nand2b_4 A_N B VGND VNB VPB VPWR Y
-M1000 VGND B a_225_47# VNB nshort w=650000u l=150000u
-+  ad=6.175e+11p pd=5.8e+06u as=1.05625e+12p ps=9.75e+06u
-M1001 a_225_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.825e+12p pd=1.565e+07u as=1.16e+12p ps=1.032e+07u
-M1003 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_225_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1005 Y a_27_47# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A_N a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1007 VGND B a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_225_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1014 Y a_27_47# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_225_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND B a_225_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 Y a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VPWR a_27_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_27_47# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y a_27_47# a_225_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_225_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_225_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_27_47# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 Y a_27_47# a_225_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 Y a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 VPWR a_27_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_225_47# a_27_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VGND B a_225_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_225_47# a_27_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_1.cdl b/cells/nand3/sky130_fd_sc_hdll__nand3_1.cdl
index b6288c4..214d7e3 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_1.cdl
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand3_1 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB 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
-MMP1 Y B 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
-MMP2 Y C 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
-MMN0 Y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand3_1
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_1.netlist.tsv b/cells/nand3/sky130_fd_sc_hdll__nand3_1.netlist.tsv
index 152bca4..e92e825 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_1.netlist.tsv
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_1.spice b/cells/nand3/sky130_fd_sc_hdll__nand3_1.spice
index 6b54577..6fe37a5 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_1.spice
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hdll__nand3_1 A B C VGND VNB VPB VPWR Y
-M1000 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=6.2e+11p pd=5.24e+06u as=5.6e+11p ps=5.12e+06u
-M1001 a_203_47# B a_119_47# VNB nshort w=650000u l=150000u
-+  ad=2.47e+11p pd=2.06e+06u as=1.755e+11p ps=1.84e+06u
-M1002 Y A a_203_47# VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
-M1003 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_119_47# C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
+X0 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_203_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_119_47# B a_203_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND C a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_2.cdl b/cells/nand3/sky130_fd_sc_hdll__nand3_2.cdl
index 140ece2..bc2b31d 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_2.cdl
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand3_2 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand3_2
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_2.netlist.tsv b/cells/nand3/sky130_fd_sc_hdll__nand3_2.netlist.tsv
index c6da606..b2a269d 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_2.netlist.tsv
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_2.spice b/cells/nand3/sky130_fd_sc_hdll__nand3_2.spice
index 64f640c..7b91b4d 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_2.spice
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__nand3_2 A B C VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.42e+12p pd=1.284e+07u as=8.7e+11p ps=7.74e+06u
-M1001 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=5.785e+11p pd=5.68e+06u as=2.08e+11p ps=1.94e+06u
-M1002 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND C a_307_47# VNB nshort w=650000u l=150000u
-+  ad=4.03e+11p pd=3.84e+06u as=4.16e+11p ps=3.88e+06u
-M1005 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_307_47# C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_47# B a_307_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_307_47# B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_47# B a_307_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_307_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 Y A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_307_47# B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_27_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VGND C a_307_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_4.cdl b/cells/nand3/sky130_fd_sc_hdll__nand3_4.cdl
index f080341..b7a23e4 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_4.cdl
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand3_4 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand3_4
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_4.netlist.tsv b/cells/nand3/sky130_fd_sc_hdll__nand3_4.netlist.tsv
index 8394532..cd766f1 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_4.netlist.tsv
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_4.spice b/cells/nand3/sky130_fd_sc_hdll__nand3_4.spice
index 04bc4bc..2422bf9 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_4.spice
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__nand3_4 A B C VGND VNB VPB VPWR Y
-M1000 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=2.25e+12p pd=2.05e+07u as=1.74e+12p ps=1.548e+07u
-M1001 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_47# C VGND VNB nshort w=650000u l=150000u
-+  ad=9.62e+11p pd=9.46e+06u as=4.16e+11p ps=3.88e+06u
-M1003 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_485_47# A Y VNB nshort w=650000u l=150000u
-+  ad=1.0335e+12p pd=9.68e+06u as=4.16e+11p ps=3.88e+06u
-M1005 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_47# B a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_485_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_485_47# B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND C a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_47# C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_47# B a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_485_47# B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND C a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_27_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_485_47# B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 Y A a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 Y A a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_27_47# B a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VGND C a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_27_47# B a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VGND C a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_27_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 a_485_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 a_485_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 a_485_47# B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.cdl b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.cdl
index 28c87cf..95aa4ff 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.cdl
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand3b_1 A_N B C VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB 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
-MMP1 Y B 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
-MMP2 Y C 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand3b_1
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.netlist.tsv b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.netlist.tsv
index 1caae1d..f928f68 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.netlist.tsv
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.65	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_hdll__nand3b_1.spice b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.spice
index 6173fb9..727348c 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.spice
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__nand3b_1 A_N B C VGND VNB VPB VPWR Y
-M1000 VPWR A_N a_53_93# VPB phighvt w=420000u l=180000u
-+  ad=6.057e+11p pd=5.31e+06u as=1.134e+11p ps=1.38e+06u
-M1001 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.9e+11p ps=5.18e+06u
-M1002 a_348_47# B a_252_47# VNB nshort w=650000u l=150000u
-+  ad=2.1125e+11p pd=1.95e+06u as=2.145e+11p ps=1.96e+06u
-M1003 VGND A_N a_53_93# VNB nshort w=420000u l=150000u
-+  ad=2.33e+11p pd=2.07e+06u as=1.302e+11p ps=1.46e+06u
-M1004 Y a_53_93# a_348_47# VNB nshort w=650000u l=150000u
-+  ad=1.8525e+11p pd=1.87e+06u as=0p ps=0u
-M1005 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_252_47# C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_53_93# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_53_93# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_53_93# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 VGND C a_252_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_252_47# B a_348_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_348_47# a_53_93# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_53_93# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.cdl b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.cdl
index 9b594ab..eec28cd 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.cdl
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand3b_2 A_N B C VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 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=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand3b_2
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.netlist.tsv b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.netlist.tsv
index 866aeb5..fb5a534 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.netlist.tsv
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	2	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	2	0.65	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_hdll__nand3b_2.spice b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.spice
index 96b35af..72708f3 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.spice
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_hdll__nand3b_2 A_N B C VGND VNB VPB VPWR Y
-M1000 VGND C a_228_47# VNB nshort w=650000u l=150000u
-+  ad=4.295e+11p pd=4.01e+06u as=4.485e+11p ps=3.98e+06u
-M1001 Y a_27_47# a_448_47# VNB nshort w=650000u l=150000u
-+  ad=2.405e+11p pd=2.04e+06u as=5.46e+11p ps=5.58e+06u
-M1002 VPWR A_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=1.4657e+12p pd=1.303e+07u as=1.134e+11p ps=1.38e+06u
-M1003 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=0p ps=0u
-M1004 a_448_47# B a_228_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_228_47# B a_448_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_228_47# C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_448_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
+X0 a_27_47# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VPWR a_27_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_448_47# B a_228_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_448_47# a_27_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_228_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 Y a_27_47# a_448_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VGND C a_228_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_27_47# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 Y a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_228_47# B a_448_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.cdl b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.cdl
index 5be2010..a6cc402 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.cdl
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand3b_4 A_N B C VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand3b_4
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.netlist.tsv b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.netlist.tsv
index 405034d..4b8d290 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.netlist.tsv
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	4	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.spice b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.spice
index 6f4cd2e..ac83c16 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.spice
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_hdll__nand3b_4 A_N B C VGND VNB VPB VPWR Y
-M1000 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.74e+12p pd=1.548e+07u as=2.61e+12p ps=2.322e+07u
-M1001 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_225_47# B a_683_47# VNB nshort w=650000u l=150000u
-+  ad=9.62e+11p pd=9.46e+06u as=8.645e+11p ps=7.86e+06u
-M1004 a_683_47# B a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_225_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1006 Y a_27_47# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A_N a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1008 a_225_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND C a_683_47# VNB nshort w=650000u l=150000u
-+  ad=8.45e+11p pd=7.8e+06u as=0p ps=0u
-M1012 a_683_47# C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_225_47# B a_683_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y a_27_47# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND C a_683_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_683_47# C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1024 a_683_47# B a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_683_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 Y a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VPWR a_27_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_683_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_27_47# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_225_47# B a_683_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Y a_27_47# a_225_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_225_47# B a_683_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VGND C a_683_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VGND C a_683_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 Y a_27_47# a_225_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 Y a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VPWR a_27_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_27_47# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_225_47# a_27_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 a_683_47# B a_225_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 a_225_47# a_27_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_683_47# B a_225_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_1.cdl b/cells/nand4/sky130_fd_sc_hdll__nand4_1.cdl
index 13f0564..fbc1eca 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_1.cdl
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand4_1 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB 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
-MMP1 Y B 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
-MMP3 Y D 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
-MMP2 Y C 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
-MMN0 Y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand4_1
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_1.netlist.tsv b/cells/nand4/sky130_fd_sc_hdll__nand4_1.netlist.tsv
index 7de4388..856fd04 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_1.netlist.tsv
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_1.spice b/cells/nand4/sky130_fd_sc_hdll__nand4_1.spice
index 27dd571..fa16e7b 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_1.spice
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__nand4_1 A B C D VGND VNB VPB VPWR Y
-M1000 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=6.4e+11p ps=5.28e+06u
-M1001 a_213_47# C a_119_47# VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=2.08e+11p ps=1.94e+06u
-M1002 Y A a_297_47# VNB nshort w=650000u l=150000u
-+  ad=2.275e+11p pd=2e+06u as=2.47e+11p ps=2.06e+06u
-M1003 a_297_47# B a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_119_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1007 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_213_47# B a_297_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_119_47# C a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND D a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_297_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_2.cdl b/cells/nand4/sky130_fd_sc_hdll__nand4_2.cdl
index 85ead80..d0b319f 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_2.cdl
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand4_2 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP3 Y D VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand4_2
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_2.netlist.tsv b/cells/nand4/sky130_fd_sc_hdll__nand4_2.netlist.tsv
index 194de35..01446a7 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_2.netlist.tsv
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_2.spice b/cells/nand4/sky130_fd_sc_hdll__nand4_2.spice
index f61b6b7..32f2965 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_2.spice
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__nand4_2 A B C D VGND VNB VPB VPWR Y
-M1000 VPWR D Y VPB phighvt w=1e+06u l=180000u
-+  ad=2.18e+12p pd=1.436e+07u as=1.16e+12p ps=1.032e+07u
-M1001 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=5.59e+11p pd=5.62e+06u as=2.08e+11p ps=1.94e+06u
-M1003 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_511_47# B a_297_47# VNB nshort w=650000u l=150000u
-+  ad=6.89e+11p pd=6.02e+06u as=4.485e+11p ps=3.98e+06u
-M1005 a_297_47# C a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_511_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1008 Y A a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_297_47# B a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND D a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_47# C a_297_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_511_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_27_47# C a_297_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_297_47# B a_511_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND D a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_297_47# C a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_27_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_511_47# B a_297_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 Y A a_511_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_4.cdl b/cells/nand4/sky130_fd_sc_hdll__nand4_4.cdl
index 073a642..fdcb16f 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_4.cdl
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand4_4 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP3 Y D VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand4_4
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_4.netlist.tsv b/cells/nand4/sky130_fd_sc_hdll__nand4_4.netlist.tsv
index 267bcf7..0bab72d 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_4.netlist.tsv
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_4.spice b/cells/nand4/sky130_fd_sc_hdll__nand4_4.spice
index 2ac6c0c..af008b9 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_4.spice
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hdll__nand4_4 A B C D VGND VNB VPB VPWR Y
-M1000 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=3.15e+12p pd=2.43e+07u as=2.32e+12p ps=2.064e+07u
-M1001 VPWR D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=9.62e+11p pd=9.46e+06u as=4.16e+11p ps=3.88e+06u
-M1003 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_883_47# B a_485_47# VNB nshort w=650000u l=150000u
-+  ad=1.0335e+12p pd=9.68e+06u as=8.645e+11p ps=7.86e+06u
-M1006 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_485_47# B a_883_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_883_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1009 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A a_883_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_47# C a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_883_47# B a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_485_47# C a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_485_47# B a_883_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND D a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_883_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_27_47# C a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A a_883_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_485_47# C a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND D a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_27_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_485_47# C a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_883_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_485_47# B a_883_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_883_47# A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_485_47# B a_883_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_27_47# C a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VGND D a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_27_47# C a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VGND D a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 a_27_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_883_47# B a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 Y A a_883_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 a_883_47# B a_485_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 Y A a_883_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 a_485_47# C a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.cdl b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.cdl
index 8d452d3..0385593 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.cdl
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand4b_1 A_N B C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB 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
-MMP1 Y B 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
-MMP2 Y C 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
-MMP3 Y D 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand4b_1
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.netlist.tsv b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.netlist.tsv
index c7c7f86..e274841 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.netlist.tsv
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.65	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_hdll__nand4b_1.spice b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.spice
index 100368c..6018c1b 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.spice
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__nand4b_1 A_N B C D VGND VNB VPB VPWR Y
-M1000 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.9e+11p pd=5.18e+06u as=1.0157e+12p ps=8.13e+06u
-M1001 VGND A_N a_40_93# VNB nshort w=420000u l=150000u
-+  ad=2.6875e+11p pd=2.18e+06u as=1.323e+11p ps=1.47e+06u
-M1002 VPWR A_N a_40_93# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1003 VPWR a_40_93# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_431_47# B a_334_47# VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=2.1775e+11p ps=1.97e+06u
-M1005 Y a_40_93# a_431_47# VNB nshort w=650000u l=150000u
-+  ad=2.925e+11p pd=2.2e+06u as=0p ps=0u
-M1006 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_334_47# C a_251_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.7225e+11p ps=1.83e+06u
-M1008 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_251_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_40_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_40_93# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 a_334_47# B a_431_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_40_93# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND D a_251_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_251_47# C a_334_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_431_47# a_40_93# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.cdl b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.cdl
index 02ca4cf..5fb7dd7 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.cdl
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand4b_2 A_N B C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP3 Y D VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 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=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand4b_2
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.netlist.tsv b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.netlist.tsv
index 8ad6a60..16765d9 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.netlist.tsv
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	2	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	2	0.65	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_hdll__nand4b_2.spice b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.spice
index b159082..00da1ce 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.spice
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_hdll__nand4b_2 A_N B C D VGND VNB VPB VPWR Y
-M1000 VPWR A_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=2.2234e+12p pd=1.56e+07u as=1.134e+11p ps=1.38e+06u
-M1001 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1002 a_705_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=6.37e+11p pd=5.86e+06u as=3.172e+11p ps=3.3e+06u
-M1003 VPWR D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_225_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=5.785e+11p pd=5.68e+06u as=2.08e+11p ps=1.94e+06u
-M1005 a_705_47# C a_495_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1006 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND D a_705_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_225_47# B a_495_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_495_47# B a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1012 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y a_27_47# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_495_47# C a_705_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_495_47# C a_705_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_27_47# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_225_47# B a_495_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VGND D a_705_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VPWR a_27_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 Y a_27_47# a_225_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_27_47# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_705_47# C a_495_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_225_47# a_27_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_495_47# B a_225_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_705_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.cdl b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.cdl
index 9daaa2e..ac8463b 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.cdl
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand4b_4 A_N B C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP3 Y D VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand4b_4
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.netlist.tsv b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.netlist.tsv
index 7c9bbde..4dbe708 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.netlist.tsv
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	4	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.spice b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.spice
index 4de5112..534387b 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.spice
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_hdll__nand4b_4 A_N B C D VGND VNB VPB VPWR Y
-M1000 a_225_47# B a_693_47# VNB nshort w=650000u l=150000u
-+  ad=9.945e+11p pd=9.56e+06u as=8.32e+11p ps=7.76e+06u
-M1001 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.32e+12p pd=2.064e+07u as=3.36e+12p ps=2.672e+07u
-M1002 VGND D a_1081_47# VNB nshort w=650000u l=150000u
-+  ad=5.85e+11p pd=5.7e+06u as=9.945e+11p ps=9.56e+06u
-M1003 a_693_47# B a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_225_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1010 Y a_27_47# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A_N a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1012 a_1081_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_225_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1081_47# C a_693_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_693_47# C a_1081_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_225_47# B a_693_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1024 VGND D a_1081_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y a_27_47# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_693_47# B a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1081_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1081_47# C a_693_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_693_47# C a_1081_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_225_47# B a_693_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_693_47# C a_1081_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_1081_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND D a_1081_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 Y a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VPWR a_27_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_225_47# B a_693_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_693_47# C a_1081_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_27_47# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 Y a_27_47# a_225_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_1081_47# C a_693_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_1081_47# C a_693_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VGND D a_1081_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 a_27_47# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 Y a_27_47# a_225_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 a_1081_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 Y a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 VPWR a_27_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 a_693_47# B a_225_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X28 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 a_225_47# a_27_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 a_693_47# B a_225_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X32 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 a_225_47# a_27_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.cdl b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.cdl
index 3f647a4..59c8c18 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.cdl
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand4bb_1 A_N B_N C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB 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
-MMP1 Y B 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
-MMP2 Y C 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
-MMP3 Y D 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 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.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand4bb_1
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.netlist.tsv b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.netlist.tsv
index b129e47..15e9942 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.netlist.tsv
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.65	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_hdll__nand4bb_1.spice b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.spice
index ffa27f3..099b252 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.spice
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__nand4bb_1 A_N B_N C D VGND VNB VPB VPWR Y
-M1000 VPWR B_N a_27_93# VPB phighvt w=420000u l=180000u
-+  ad=1.1325e+12p pd=8.99e+06u as=1.134e+11p ps=1.38e+06u
-M1001 VPWR a_500_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=7e+11p ps=5.4e+06u
-M1002 a_434_47# a_27_93# a_334_47# VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=2.275e+11p ps=2e+06u
-M1003 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_334_47# C a_218_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.795e+11p ps=2.16e+06u
-M1005 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_500_21# a_434_47# VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
-M1007 a_218_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.372e+11p ps=3.45e+06u
-M1008 a_500_21# A_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1009 Y a_27_93# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_500_21# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.533e+11p pd=1.57e+06u as=0p ps=0u
-M1011 VGND B_N a_27_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
+X0 a_27_93# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VGND A_N a_500_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VPWR a_27_93# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y a_500_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VPWR A_N a_500_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 a_434_47# a_500_21# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_27_93# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_334_47# a_27_93# a_434_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VGND D a_218_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_218_47# C a_334_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.cdl b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.cdl
index 2f3f8a9..4c091bf 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.cdl
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand4bb_2 A_N B_N C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP3 Y D VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 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.65 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.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A 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=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand4bb_2
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.netlist.tsv b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.netlist.tsv
index 406f00d..60ff39d 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.netlist.tsv
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	2	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	2	0.65	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_hdll__nand4bb_2.spice b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.spice
index 8ed9103..27e2f26 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.spice
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__nand4bb_2 A_N B_N C D VGND VNB VPB VPWR Y
-M1000 a_211_413# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.974e+11p pd=1.78e+06u as=3.424e+11p ps=3.42e+06u
-M1001 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=2.0218e+12p ps=1.522e+07u
-M1002 VPWR B_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1003 a_361_47# a_211_413# Y VNB nshort w=650000u l=150000u
-+  ad=5.785e+11p pd=5.68e+06u as=2.08e+11p ps=1.94e+06u
-M1004 Y a_211_413# a_361_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_841_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=5.59e+11p pd=5.62e+06u as=0p ps=0u
-M1007 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND D a_841_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_211_413# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_841_47# C a_641_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1012 VGND B_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1013 a_211_413# A_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=2.016e+11p pd=1.8e+06u as=0p ps=0u
-M1014 Y a_211_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_361_47# a_27_47# a_641_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_641_47# a_27_47# a_361_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_641_47# C a_841_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_47# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VGND D a_841_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_641_47# C a_841_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 Y a_211_413# a_361_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_641_47# a_27_47# a_361_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND A_N a_211_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_27_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_841_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 Y a_211_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_361_47# a_211_413# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VPWR A_N a_211_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X13 Y a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_27_47# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_361_47# a_27_47# a_641_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 a_841_47# C a_641_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 VPWR a_211_413# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.cdl b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.cdl
index 3f27502..bf3d3f9 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.cdl
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand4bb_4 A_N B_N C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP3 Y D VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand4bb_4
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.netlist.tsv b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.netlist.tsv
index a29ebd4..89c2e27 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.netlist.tsv
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	4	0.65	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.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.spice b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.spice
index c0d2feb..5e4ffe4 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.spice
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_hdll__nand4bb_4 A_N B_N C D VGND VNB VPB VPWR Y
-M1000 a_1251_47# C a_853_47# VNB nshort w=650000u l=150000u
-+  ad=1.02375e+12p pd=9.65e+06u as=8.645e+11p ps=7.86e+06u
-M1001 a_206_47# B_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=4.55e+11p pd=2.91e+06u as=3.425e+12p ps=2.685e+07u
-M1002 a_395_47# a_206_47# a_853_47# VNB nshort w=650000u l=150000u
-+  ad=9.62e+11p pd=9.46e+06u as=0p ps=0u
-M1003 Y a_206_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.32e+12p pd=2.064e+07u as=0p ps=0u
-M1004 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_27_47# a_395_47# VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=0p ps=0u
-M1008 a_853_47# a_206_47# a_395_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_853_47# C a_1251_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1251_47# C a_853_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_206_47# B_N VGND VNB nshort w=650000u l=150000u
-+  ad=3.12e+11p pd=2.26e+06u as=6.0125e+11p ps=5.75e+06u
-M1014 VPWR A_N a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1015 VPWR a_206_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1251_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND D a_1251_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y a_206_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_853_47# C a_1251_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1022 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_395_47# a_206_47# a_853_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1251_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_853_47# a_206_47# a_395_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND D a_1251_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_206_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_395_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y a_27_47# a_395_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_395_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_853_47# C a_1251_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND D a_1251_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 Y a_206_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_395_47# a_206_47# a_853_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y a_27_47# a_395_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_27_47# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND D a_1251_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 Y a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VPWR a_27_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_853_47# a_206_47# a_395_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_1251_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 Y a_206_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 VPWR a_206_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 Y a_27_47# a_395_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_1251_47# C a_853_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_1251_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 a_27_47# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 VGND B_N a_206_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 a_1251_47# C a_853_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 a_395_47# a_27_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 VPWR B_N a_206_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 VPWR a_206_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 Y a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 a_395_47# a_27_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 a_853_47# a_206_47# a_395_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X32 a_395_47# a_206_47# a_853_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X33 VPWR a_27_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X34 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 a_853_47# C a_1251_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_1.cdl b/cells/nor2/sky130_fd_sc_hdll__nor2_1.cdl
index fa1748d..fd49b8e 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_1.cdl
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor2_1 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor2_1
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_1.netlist.tsv b/cells/nor2/sky130_fd_sc_hdll__nor2_1.netlist.tsv
index a1bc1a2..a62ee3a 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_1.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.65	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_1.spice b/cells/nor2/sky130_fd_sc_hdll__nor2_1.spice
index 3843111..1f6630f 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_1.spice
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_hdll__nor2_1 A B VGND VNB VPB VPWR Y
-M1000 VPWR A a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=6.1e+11p pd=3.22e+06u as=2.9e+11p ps=2.58e+06u
-M1001 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=5.915e+11p pd=4.42e+06u as=1.755e+11p ps=1.84e+06u
-M1002 a_117_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1003 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_117_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_2.cdl b/cells/nor2/sky130_fd_sc_hdll__nor2_2.cdl
index 851e3c9..c4e8114 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_2.cdl
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor2_2 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor2_2
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_2.netlist.tsv b/cells/nor2/sky130_fd_sc_hdll__nor2_2.netlist.tsv
index 8c5d401..81ef83b 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_2.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_2.spice b/cells/nor2/sky130_fd_sc_hdll__nor2_2.spice
index 280c287..ad3cf5d 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_2.spice
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_2.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__nor2_2 A B VGND VNB VPB VPWR Y
-M1000 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=8.5e+11p ps=7.7e+06u
-M1001 a_27_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1002 Y B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=4.81e+11p pd=4.08e+06u as=6.0125e+11p ps=5.75e+06u
-M1004 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_27_297# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_4.cdl b/cells/nor2/sky130_fd_sc_hdll__nor2_4.cdl
index a50118e..3fda171 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_4.cdl
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor2_4 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor2_4
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_4.netlist.tsv b/cells/nor2/sky130_fd_sc_hdll__nor2_4.netlist.tsv
index 1568bd2..90074ef 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_4.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_4.spice b/cells/nor2/sky130_fd_sc_hdll__nor2_4.spice
index 69edfc5..ba474be 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_4.spice
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_4.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__nor2_4 A B VGND VNB VPB VPWR Y
-M1000 Y B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.44e+12p ps=1.288e+07u
-M1001 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1002 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=9.425e+11p pd=9.4e+06u as=8.97e+11p ps=7.96e+06u
-M1003 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_27_297# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 Y B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_27_297# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_8.cdl b/cells/nor2/sky130_fd_sc_hdll__nor2_8.cdl
index e641df4..7d64791 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_8.cdl
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor2_8 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor2_8
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_8.netlist.tsv b/cells/nor2/sky130_fd_sc_hdll__nor2_8.netlist.tsv
index 4230439..2fda901 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_8.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	8	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_8.spice b/cells/nor2/sky130_fd_sc_hdll__nor2_8.spice
index 51fda6a..bac6830 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_8.spice
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_8.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hdll__nor2_8 A B VGND VNB VPB VPWR Y
-M1000 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=1.729e+12p pd=1.572e+07u as=1.7745e+12p ps=1.716e+07u
-M1001 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=2.6e+12p ps=2.32e+07u
-M1002 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=0p ps=0u
-M1004 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_27_297# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 Y B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_27_297# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_27_297# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_27_297# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 Y B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 Y B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.cdl b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.cdl
index 8768d21..6ab1117 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.cdl
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor2b_1 A B_N VGND VNB VPB VPWR Y
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N 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
-MMN0 Y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB 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_hdll__nor2b_1
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.netlist.tsv b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.netlist.tsv
index 1c5d1ea..f2ce1b5 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.netlist.tsv
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.65	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.0	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.65	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_hdll__nor2b_1.spice b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.spice
index 61dafbd..0e0fed6 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.spice
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hdll__nor2b_1 A B_N VGND VNB VPB VPWR Y
-M1000 a_253_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.3e+11p pd=2.46e+06u as=3.666e+11p ps=3e+06u
-M1001 VPWR B_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1002 VGND a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=4.912e+11p pd=4.26e+06u as=1.755e+11p ps=1.84e+06u
-M1003 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y a_27_47# a_253_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1005 VGND B_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
+X0 a_27_47# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VPWR A a_253_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 Y a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_253_297# a_27_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_27_47# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.cdl b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.cdl
index 63ac881..a5ef8d1 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.cdl
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor2b_2 A B_N VGND VNB VPB VPWR Y
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N 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
-MMN0 Y A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB 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_hdll__nor2b_2
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.netlist.tsv b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.netlist.tsv
index bafa538..ecd12bd 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.netlist.tsv
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.65	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_hdll__nor2b_2.spice b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.spice
index d357c91..fff9a63 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.spice
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__nor2b_2 A B_N VGND VNB VPB VPWR Y
-M1000 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=4.034e+11p pd=3.96e+06u as=8.5e+11p ps=7.7e+06u
-M1001 a_27_297# a_271_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1002 VPWR B_N a_271_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.806e+11p ps=1.7e+06u
-M1003 Y a_271_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=6.8595e+11p ps=7.07e+06u
-M1005 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_271_21# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_271_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B_N a_271_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=1.68e+06u
+X0 a_271_21# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_271_21# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 Y a_271_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y a_271_21# a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND a_271_21# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_27_297# a_271_21# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.cdl b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.cdl
index b90b02e..8b61cf2 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.cdl
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor2b_4 A B_N VGND VNB VPB VPWR Y
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N 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
-MMN0 Y A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor2b_4
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.netlist.tsv b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.netlist.tsv
index 0fb41f8..2771675 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.netlist.tsv
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	4	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.spice b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.spice
index 2b1249d..21a375d 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.spice
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_hdll__nor2b_4 A B_N VGND VNB VPB VPWR Y
-M1000 Y a_459_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.45e+12p ps=1.29e+07u
-M1001 VGND a_459_21# Y VNB nshort w=650000u l=150000u
-+  ad=1.183e+12p pd=1.144e+07u as=8.645e+11p ps=7.86e+06u
-M1002 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=0p ps=0u
-M1003 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y a_459_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_459_21# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_297# a_459_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B_N a_459_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1012 VGND B_N a_459_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.82e+11p ps=1.86e+06u
-M1013 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y a_459_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y a_459_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_297# a_459_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_459_21# a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND a_459_21# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND a_459_21# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_459_21# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_27_297# a_459_21# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 Y a_459_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 Y a_459_21# a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 Y a_459_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_27_297# a_459_21# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_459_21# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_1.cdl b/cells/nor3/sky130_fd_sc_hdll__nor3_1.cdl
index 3db2422..e8ce783 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_1.cdl
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor3_1 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor3_1
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_1.netlist.tsv b/cells/nor3/sky130_fd_sc_hdll__nor3_1.netlist.tsv
index 3ebf9d0..ea98658 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_1.netlist.tsv
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.65	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_1.spice b/cells/nor3/sky130_fd_sc_hdll__nor3_1.spice
index ca80d63..132b661 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_1.spice
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hdll__nor3_1 A B C VGND VNB VPB VPWR Y
-M1000 a_211_297# B a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=2.9e+11p ps=2.58e+06u
-M1001 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=6.305e+11p ps=4.54e+06u
-M1002 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_117_297# C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1004 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A a_211_297# VPB phighvt w=1e+06u l=180000u
-+  ad=6.1e+11p pd=3.22e+06u as=0p ps=0u
+X0 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 Y C a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_211_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_117_297# B a_211_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_2.cdl b/cells/nor3/sky130_fd_sc_hdll__nor3_2.cdl
index 3d96d71..13935a1 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_2.cdl
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor3_2 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor3_2
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_2.netlist.tsv b/cells/nor3/sky130_fd_sc_hdll__nor3_2.netlist.tsv
index bcc458e..a395e09 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_2.netlist.tsv
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_2.spice b/cells/nor3/sky130_fd_sc_hdll__nor3_2.spice
index 2b19300..690b189 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_2.spice
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__nor3_2 A B C VGND VNB VPB VPWR Y
-M1000 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=8.7e+11p ps=7.74e+06u
-M1001 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=8.6125e+11p pd=9.15e+06u as=7.215e+11p ps=6.12e+06u
-M1002 a_27_297# B a_309_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.3e+11p ps=7.66e+06u
-M1003 a_309_297# C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1004 a_309_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y C a_309_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y C a_309_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_309_297# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_309_297# C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_27_297# B a_309_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_4.cdl b/cells/nor3/sky130_fd_sc_hdll__nor3_4.cdl
index 9184142..cf97944 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_4.cdl
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor3_4 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor3_4
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_4.netlist.tsv b/cells/nor3/sky130_fd_sc_hdll__nor3_4.netlist.tsv
index b794bcd..ce02f79 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_4.netlist.tsv
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_4.spice b/cells/nor3/sky130_fd_sc_hdll__nor3_4.spice
index 6a03eb9..5455788 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_4.spice
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__nor3_4 A B C VGND VNB VPB VPWR Y
-M1000 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=1.248e+12p pd=1.164e+07u as=1.4235e+12p ps=1.348e+07u
-M1001 a_497_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=1.43e+12p ps=1.286e+07u
-M1002 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1004 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y C a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1007 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_497_297# C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_297# B a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_497_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_497_297# C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_297# B a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_497_297# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_497_297# C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_497_297# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y C a_497_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_27_297# B a_497_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 Y C a_497_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_497_297# C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_27_297# B a_497_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.cdl b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.cdl
index 84cd766..86f20f6 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.cdl
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor3b_1 A B C_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N 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
-MMN0 Y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB 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_hdll__nor3b_1
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.netlist.tsv b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.netlist.tsv
index 05fc2a0..e0fa24f 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.netlist.tsv
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.65	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_hdll__nor3b_1.spice b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.spice
index b9e4a55..731281b 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.spice
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__nor3b_1 A B C_N VGND VNB VPB VPWR Y
-M1000 a_91_199# C_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=4.62e+11p ps=4.11e+06u
-M1001 a_263_297# B a_169_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=2.9e+11p ps=2.58e+06u
-M1002 a_169_297# a_91_199# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.3e+11p ps=2.66e+06u
-M1003 a_91_199# C_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=3.057e+11p ps=2.71e+06u
-M1004 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=4.29e+11p pd=3.92e+06u as=0p ps=0u
-M1005 VGND a_91_199# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_263_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_263_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND C_N a_91_199# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_169_297# B a_263_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VPWR C_N a_91_199# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y a_91_199# a_169_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 Y a_91_199# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.cdl b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.cdl
index 6ad1b71..c6ced97 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.cdl
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor3b_2 A B C_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N 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
-MMN0 Y A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB 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_hdll__nor3b_2
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.netlist.tsv b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.netlist.tsv
index a998a77..939585a 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.netlist.tsv
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	2	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	2	0.65	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_hdll__nor3b_2.spice b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.spice
index a86a3a4..c6779d2 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.spice
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_hdll__nor3b_2 A B C_N VGND VNB VPB VPWR Y
-M1000 Y a_571_21# a_309_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=8.7e+11p ps=7.74e+06u
-M1001 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=4.034e+11p pd=3.96e+06u as=8.7e+11p ps=7.74e+06u
-M1002 VGND C_N a_571_21# VNB nshort w=420000u l=150000u
-+  ad=1.0662e+12p pd=1.084e+07u as=1.092e+11p ps=1.36e+06u
-M1003 a_27_297# B a_309_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_309_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_571_21# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=6.89e+11p ps=6.02e+06u
-M1006 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y a_571_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR C_N a_571_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1010 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_309_297# a_571_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 Y a_571_21# a_309_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_571_21# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y a_571_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_309_297# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_309_297# a_571_21# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_571_21# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VGND a_571_21# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_27_297# B a_309_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.cdl b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.cdl
index dbb5649..922d580 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.cdl
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor3b_4 A B C_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N 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
-MMN0 Y A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor3b_4
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.netlist.tsv b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.netlist.tsv
index 8eecce3..fbe361a 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.netlist.tsv
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	4	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.spice b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.spice
index a16b1ec..179be1b 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.spice
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_hdll__nor3b_4 A B C_N VGND VNB VPB VPWR Y
-M1000 VPWR A a_215_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.5e+11p pd=7.7e+06u as=1.16e+12p ps=1.032e+07u
-M1001 VPWR C_N a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1002 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=1.3455e+12p pd=1.194e+07u as=1.6575e+12p ps=1.42e+07u
-M1003 a_605_297# B a_215_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.41e+12p pd=1.282e+07u as=0p ps=0u
-M1004 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.145e+11p ps=1.96e+06u
-M1007 Y a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_215_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_605_297# a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1010 a_215_297# B a_605_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A a_215_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y a_27_47# a_605_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_605_297# B a_215_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_215_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_605_297# a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_215_297# B a_605_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y a_27_47# a_605_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_605_297# a_27_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND a_27_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_215_297# B a_605_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 Y a_27_47# a_605_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_605_297# B a_215_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_27_47# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_605_297# a_27_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_27_47# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_215_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_215_297# B a_605_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VPWR A a_215_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_605_297# B a_215_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 Y a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 Y a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 Y a_27_47# a_605_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_215_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 VGND a_27_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 VPWR A a_215_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_1.cdl b/cells/nor4/sky130_fd_sc_hdll__nor4_1.cdl
index 4084e0f..91531c4 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_1.cdl
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4_1 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP3 sndPC D VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN0 Y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN1 Y B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN2 Y C VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN3 Y D VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_hdll__nor4_1
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_1.netlist.tsv b/cells/nor4/sky130_fd_sc_hdll__nor4_1.netlist.tsv
index 0c61433..7232035 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_1.netlist.tsv
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	1	0.65	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	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_1.spice b/cells/nor4/sky130_fd_sc_hdll__nor4_1.spice
index e33d6c6..47b619b 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_1.spice
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__nor4_1 A B C D VGND VNB VPB VPWR Y
-M1000 a_221_297# C a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=3.4e+11p ps=2.68e+06u
-M1001 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=6.045e+11p pd=5.76e+06u as=4.29e+11p ps=3.92e+06u
-M1002 VPWR A a_317_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=3.1e+11p ps=2.62e+06u
-M1003 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_117_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1005 a_317_297# B a_221_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y D a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_317_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_117_297# C a_221_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_221_297# B a_317_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND D Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_2.cdl b/cells/nor4/sky130_fd_sc_hdll__nor4_2.cdl
index 5b0a418..9d0e6a2 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_2.cdl
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4_2 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMP2 sndPB C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMP3 sndPC D VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP1 sndPA B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP2 sndPB C VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP3 sndPC D VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN0 Y A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN1 Y B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN2 Y C VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN3 Y D VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_hdll__nor4_2
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_2.netlist.tsv b/cells/nor4/sky130_fd_sc_hdll__nor4_2.netlist.tsv
index 08615f2..8e2e381 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_2.netlist.tsv
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	2	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_2.spice b/cells/nor4/sky130_fd_sc_hdll__nor4_2.spice
index af3a229..e63adf4 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_2.spice
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__nor4_2 A B C D VGND VNB VPB VPWR Y
-M1000 a_309_297# C a_515_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=8.5e+11p ps=7.7e+06u
-M1001 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=8.7e+11p ps=7.74e+06u
-M1002 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=1.066e+12p pd=1.108e+07u as=9.62e+11p ps=8.16e+06u
-M1003 a_27_297# B a_309_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_309_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_515_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1009 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y D a_515_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_515_297# C a_309_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_515_297# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VGND D Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_309_297# C a_515_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_309_297# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_515_297# C a_309_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 Y D a_515_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_27_297# B a_309_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_4.cdl b/cells/nor4/sky130_fd_sc_hdll__nor4_4.cdl
index 4bafe02..f1f0b93 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_4.cdl
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4_4 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMP1 sndPA B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMP2 sndPB C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMP3 sndPC D VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP1 sndPA B VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP2 sndPB C VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP3 sndPC D VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN0 Y A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN1 Y B VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN2 Y C VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN3 Y D VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_hdll__nor4_4
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_4.netlist.tsv b/cells/nor4/sky130_fd_sc_hdll__nor4_4.netlist.tsv
index b6bacd3..13d35e9 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_4.netlist.tsv
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_4.spice b/cells/nor4/sky130_fd_sc_hdll__nor4_4.spice
index ede0b7a..a16f019 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_4.spice
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hdll__nor4_4 A B C D VGND VNB VPB VPWR Y
-M1000 a_497_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=1.43e+12p ps=1.286e+07u
-M1001 a_887_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.41e+12p pd=1.282e+07u as=5.8e+11p ps=5.16e+06u
-M1002 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1003 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=2.0475e+12p pd=1.8e+07u as=1.794e+12p ps=1.592e+07u
-M1004 a_497_297# C a_887_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y D a_887_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_887_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_887_297# C a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_297# B a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_497_297# C a_887_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_497_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_887_297# C a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_297# B a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y D a_887_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_497_297# C a_887_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_887_297# C a_497_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_887_297# C a_497_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_497_297# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_887_297# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 Y D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 Y D a_887_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 Y D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_497_297# C a_887_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_27_297# B a_497_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 Y D a_887_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 a_887_297# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 a_497_297# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 VGND D Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 a_27_297# B a_497_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 VGND D Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X28 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_6.cdl b/cells/nor4/sky130_fd_sc_hdll__nor4_6.cdl
index e2d8edc..542ed8c 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_6.cdl
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_6.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4_6 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMP1 sndPA B VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMP2 sndPB C VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMP3 sndPC D VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMN0 Y A VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP1 sndPA B VPB phighvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP2 sndPB C VPB phighvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP3 sndPC D VPB phighvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN0 Y A VNB nshort m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN1 Y B VNB nshort m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN2 Y C VNB nshort m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN3 Y D VNB nshort m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_hdll__nor4_6
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_6.netlist.tsv b/cells/nor4/sky130_fd_sc_hdll__nor4_6.netlist.tsv
index e83cb04..4e3b8b9 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_6.netlist.tsv
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_6.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__nor4_6	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	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_6.spice b/cells/nor4/sky130_fd_sc_hdll__nor4_6.spice
index f21c0b1..fa79004 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_6.spice
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_6.spice
@@ -16,100 +16,52 @@
 
 
 .subckt sky130_fd_sc_hdll__nor4_6 A B C D VGND VNB VPB VPWR Y
-M1000 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=2.01e+12p ps=1.802e+07u
-M1001 a_1263_297# C a_685_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.02e+12p pd=1.804e+07u as=1.74e+12p ps=1.548e+07u
-M1002 Y D a_1263_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=0p ps=0u
-M1003 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=3.419e+12p pd=2.742e+07u as=2.106e+12p ps=2.208e+07u
-M1004 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_685_297# C a_1263_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# B a_685_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_685_297# C a_1263_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1263_297# C a_685_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_685_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1263_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_297# B a_685_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1263_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y D a_1263_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y D a_1263_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_27_297# B a_685_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_685_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1263_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_685_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_685_297# C a_1263_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_1263_297# C a_685_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1263_297# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VGND D Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_1263_297# C a_685_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 Y D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_685_297# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_685_297# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_1263_297# C a_685_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 VGND D Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_27_297# B a_685_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_685_297# C a_1263_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 Y D a_1263_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 Y D a_1263_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 VGND D Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 a_685_297# C a_1263_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 a_1263_297# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 a_27_297# B a_685_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 a_1263_297# C a_685_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X34 a_685_297# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X36 a_27_297# B a_685_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X37 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X38 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X39 Y D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X40 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X41 a_1263_297# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X42 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X43 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X44 a_685_297# C a_1263_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X45 Y D a_1263_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X46 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X47 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_8.cdl b/cells/nor4/sky130_fd_sc_hdll__nor4_8.cdl
index 57d0d3f..c75c0d6 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_8.cdl
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_8.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4_8 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMP1 sndPA B VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMP2 sndPB C VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMP3 sndPC D VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMN0 Y A VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP1 sndPA B VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP2 sndPB C VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP3 sndPC D VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN0 Y A VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN1 Y B VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN2 Y C VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN3 Y D VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_hdll__nor4_8
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_8.netlist.tsv b/cells/nor4/sky130_fd_sc_hdll__nor4_8.netlist.tsv
index 1bdee87..44d3c82 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_8.netlist.tsv
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_8.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__nor4_8	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	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_8.spice b/cells/nor4/sky130_fd_sc_hdll__nor4_8.spice
index 93ddc79..b28ad83 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_8.spice
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_8.spice
@@ -16,132 +16,68 @@
 
 
 .subckt sky130_fd_sc_hdll__nor4_8 A B C D VGND VNB VPB VPWR Y
-M1000 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.57e+12p pd=2.314e+07u as=1.16e+12p ps=1.032e+07u
-M1001 a_869_297# C a_1635_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.32e+12p pd=2.064e+07u as=2.58e+12p ps=2.316e+07u
-M1002 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=2.808e+12p pd=2.944e+07u as=4.355e+12p ps=3.55e+07u
-M1003 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_297# B a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_1635_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1007 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_869_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y D a_1635_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_869_297# C a_1635_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_869_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1635_297# C a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1635_297# C a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y D a_1635_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_869_297# C a_1635_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1635_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_869_297# C a_1635_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_27_297# B a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y D a_1635_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1635_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_27_297# B a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_1635_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_869_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 a_1635_297# C a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 a_27_297# B a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 a_869_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 a_1635_297# C a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 Y D a_1635_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1061 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_1635_297# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 Y D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_869_297# C a_1635_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_869_297# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VGND D Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_27_297# B a_869_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 Y D a_1635_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_1635_297# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 a_1635_297# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 a_869_297# C a_1635_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 a_1635_297# C a_869_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 a_1635_297# C a_869_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 a_27_297# B a_869_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 Y D a_1635_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X33 a_869_297# C a_1635_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X34 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X35 Y D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X36 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X37 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X38 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X39 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X40 Y D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X41 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X42 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X43 Y D a_1635_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X44 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X45 a_869_297# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X46 VGND D Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X47 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X48 a_27_297# B a_869_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X49 a_869_297# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X50 a_869_297# C a_1635_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X51 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X52 a_869_297# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X53 a_27_297# B a_869_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X54 a_1635_297# C a_869_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X55 Y D a_1635_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X56 a_1635_297# C a_869_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X57 VGND D Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X58 a_1635_297# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X59 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X60 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X61 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X62 VGND D Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X63 Y D VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.cdl b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.cdl
index 8e69586..7f26a38 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.cdl
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4b_1 A B C D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N 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
-MMN0 Y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB 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_hdll__nor4b_1
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.netlist.tsv b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.netlist.tsv
index 0ed7c72..f27ca84 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.netlist.tsv
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	1	0.65	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_hdll__nor4b_1.spice b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.spice
index 1f39ce6..e5b419a 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.spice
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__nor4b_1 A B C D_N VGND VNB VPB VPWR Y
-M1000 a_263_297# C a_169_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.5e+11p pd=2.7e+06u as=2.9e+11p ps=2.58e+06u
-M1001 a_169_297# a_91_199# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.3e+11p ps=3.06e+06u
-M1002 a_91_199# D_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=4.799e+11p ps=3.07e+06u
-M1003 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=3.835e+11p pd=3.78e+06u as=8.046e+11p ps=6.45e+06u
-M1004 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A a_369_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1006 Y a_91_199# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_91_199# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1009 a_369_297# B a_263_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_263_297# B a_369_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_169_297# C a_263_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 Y a_91_199# a_169_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_369_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND a_91_199# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND D_N a_91_199# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR D_N a_91_199# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X9 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.cdl b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.cdl
index 362cad1..27fe0b2 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.cdl
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4b_2 A B C D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N 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
-MMN0 Y A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB 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_hdll__nor4b_2
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.netlist.tsv b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.netlist.tsv
index b018fa9..f23b05d 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.netlist.tsv
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	2	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	2	0.65	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_hdll__nor4b_2.spice b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.spice
index 5ba79bc..d9f9116 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.spice
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_hdll__nor4b_2 A B C D_N VGND VNB VPB VPWR Y
-M1000 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.3e+11p pd=7.66e+06u as=4.034e+11p ps=3.96e+06u
-M1001 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=1.1897e+12p pd=1.252e+07u as=9.295e+11p ps=8.06e+06u
-M1002 VGND D_N a_754_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1003 Y a_754_21# a_514_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=8.3e+11p ps=7.66e+06u
-M1004 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR D_N a_754_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1006 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_514_297# C a_305_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1008 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_305_297# C a_514_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_297# B a_305_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_754_21# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_305_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y a_754_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_514_297# a_754_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_514_297# C a_305_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_754_21# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y a_754_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_305_297# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_27_297# B a_305_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 Y a_754_21# a_514_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_754_21# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_514_297# a_754_21# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VGND a_754_21# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_305_297# C a_514_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.cdl b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.cdl
index 0214146..8716ee1 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.cdl
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4b_4 A B C D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N 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
-MMN0 Y A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor4b_4
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.netlist.tsv b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.netlist.tsv
index 5458da1..cef8dd5 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.netlist.tsv
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	4	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.spice b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.spice
index 7c91e73..8fe5ea2 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.spice
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_hdll__nor4b_4 A B C D_N VGND VNB VPB VPWR Y
-M1000 a_27_297# B a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.41e+12p pd=1.282e+07u as=1.16e+12p ps=1.032e+07u
-M1001 VGND a_1311_21# Y VNB nshort w=650000u l=150000u
-+  ad=2.2815e+12p pd=2.002e+07u as=1.7615e+12p ps=1.582e+07u
-M1002 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.7e+11p ps=7.74e+06u
-M1003 Y a_1311_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_493_297# C a_883_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.41e+12p ps=1.282e+07u
-M1005 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_493_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_883_297# C a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# B a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y a_1311_21# a_883_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1013 VPWR D_N a_1311_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1014 VGND a_1311_21# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_493_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_883_297# a_1311_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_493_297# C a_883_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y a_1311_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y a_1311_21# a_883_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_883_297# a_1311_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND D_N a_1311_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1028 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_883_297# C a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_297# B a_493_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_883_297# a_1311_21# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_1311_21# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 Y a_1311_21# a_883_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y a_1311_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y a_1311_21# a_883_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_493_297# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_493_297# C a_883_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 a_883_297# a_1311_21# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_493_297# C a_883_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 a_1311_21# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 a_27_297# B a_493_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 a_883_297# C a_493_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 Y a_1311_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 VGND a_1311_21# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 a_883_297# C a_493_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 VGND a_1311_21# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X32 a_493_297# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.cdl b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.cdl
index 351f417..8090eed 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.cdl
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4bb_1 A B C_N D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.42 l=0.18 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.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nshort m=1 w=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_hdll__nor4bb_1
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.netlist.tsv b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.netlist.tsv
index d2f2f77..11adb86 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.netlist.tsv
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	1	0.65	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_hdll__nor4bb_1.spice b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.spice
index 31c1142..4e9d5d5 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.spice
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__nor4bb_1 A B C_N D_N VGND VNB VPB VPWR Y
-M1000 VGND C_N a_27_410# VNB nshort w=420000u l=150000u
-+  ad=7.674e+11p pd=7.31e+06u as=1.302e+11p ps=1.46e+06u
-M1001 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=3.9e+11p pd=3.8e+06u as=0p ps=0u
-M1002 a_216_93# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.281e+11p pd=1.45e+06u as=0p ps=0u
-M1003 Y a_216_93# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_422_297# a_216_93# Y VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=2.7e+11p ps=2.54e+06u
-M1006 VGND a_27_410# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_622_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.23625e+11p pd=5.22e+06u as=2.9e+11p ps=2.58e+06u
-M1008 VPWR C_N a_27_410# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1009 a_216_93# D_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1010 a_622_297# B a_518_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.4e+11p ps=2.68e+06u
-M1011 a_518_297# a_27_410# a_422_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_216_93# a_422_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y a_27_410# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_422_297# a_27_410# a_518_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VGND a_216_93# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND D_N a_216_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_622_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_518_297# B a_622_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_27_410# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X10 VPWR D_N a_216_93# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X11 a_27_410# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.cdl b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.cdl
index 8d0d1bd..ea2e15b 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.cdl
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4bb_2 A B C_N D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.42 l=0.18 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.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nshort m=1 w=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_hdll__nor4bb_2
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.netlist.tsv b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.netlist.tsv
index ec839dd..28a73cc 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.netlist.tsv
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	2	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	2	0.65	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_hdll__nor4bb_2.spice b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.spice
index 12032f4..53dbfc6 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.spice
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__nor4bb_2 A B C_N D_N VGND VNB VPB VPWR Y
-M1000 Y a_216_93# VGND VNB nshort w=650000u l=150000u
-+  ad=9.295e+11p pd=8.06e+06u as=1.29595e+12p ps=1.29e+07u
-M1001 a_823_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.65e+11p pd=7.73e+06u as=5.43625e+11p ps=5.26e+06u
-M1002 a_216_93# C_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1003 a_433_297# a_216_93# a_343_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=8.3e+11p ps=7.66e+06u
-M1004 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_27_93# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_823_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR D_N a_27_93# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1009 a_823_297# B a_433_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y a_27_93# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_343_297# a_27_93# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1012 VGND a_216_93# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_216_93# C_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1014 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_433_297# B a_823_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y a_27_93# a_343_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_343_297# a_216_93# a_433_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND D_N a_27_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
+X0 VGND a_27_93# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 Y a_27_93# a_343_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND C_N a_216_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_216_93# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 Y a_216_93# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_343_297# a_27_93# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 Y a_27_93# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_27_93# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_433_297# B a_823_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_27_93# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X13 VPWR C_N a_216_93# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X14 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_433_297# a_216_93# a_343_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_343_297# a_216_93# a_433_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 VPWR A a_823_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 a_823_297# B a_433_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_823_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.cdl b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.cdl
index 5e274df..03b1c6e 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.cdl
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4bb_4 A B C_N D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N 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
-MMN0 Y A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor4bb_4
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.netlist.tsv b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.netlist.tsv
index a90d88a..2e022dd 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.netlist.tsv
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	4	0.65	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.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.spice b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.spice
index a504fba..73bd384 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.spice
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_hdll__nor4bb_4 A B C_N D_N VGND VNB VPB VPWR Y
-M1000 Y a_207_47# a_331_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.41e+12p ps=1.282e+07u
-M1001 a_1187_297# B a_797_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.43e+12p pd=1.286e+07u as=1.16e+12p ps=1.032e+07u
-M1002 VPWR C_N a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=2.9e+11p ps=2.58e+06u
-M1003 a_207_47# D_N VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=2.223e+12p ps=1.984e+07u
-M1004 Y a_27_297# VGND VNB nshort w=650000u l=150000u
-+  ad=1.794e+12p pd=1.592e+07u as=0p ps=0u
-M1005 VGND a_27_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C_N a_27_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.1125e+11p ps=1.95e+06u
-M1007 VGND a_207_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_331_297# a_207_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_797_297# B a_1187_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_27_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_797_297# a_27_297# a_331_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y a_27_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y a_207_47# a_331_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1187_297# B a_797_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_331_297# a_27_297# a_797_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y a_207_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A a_1187_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_797_297# B a_1187_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_797_297# a_27_297# a_331_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1187_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_207_47# D_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1027 VGND a_207_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y a_207_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_331_297# a_207_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A a_1187_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1187_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_331_297# a_27_297# a_797_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_1187_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_797_297# a_27_297# a_331_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_797_297# B a_1187_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 Y a_27_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_331_297# a_27_297# a_797_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_27_297# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VGND a_27_297# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y a_207_47# a_331_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR A a_1187_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Y a_207_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VGND a_27_297# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_1187_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VGND D_N a_207_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 Y a_207_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_27_297# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_331_297# a_27_297# a_797_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 a_1187_297# B a_797_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_331_297# a_207_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 Y a_27_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 Y a_207_47# a_331_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 a_797_297# B a_1187_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 VGND a_207_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 a_1187_297# B a_797_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 a_797_297# a_27_297# a_331_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 VGND a_207_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X32 a_1187_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X34 VPWR D_N a_207_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 a_331_297# a_207_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_1.cdl b/cells/o211a/sky130_fd_sc_hdll__o211a_1.cdl
index 833495b..7c9a29d 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_1.cdl
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o211a_1 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o211a_1
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_1.netlist.tsv b/cells/o211a/sky130_fd_sc_hdll__o211a_1.netlist.tsv
index 4a903ff..205a9fb 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_1.netlist.tsv
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__o211a_1	A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_1.spice b/cells/o211a/sky130_fd_sc_hdll__o211a_1.spice
index 65dd0b7..a77ac77 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_1.spice
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__o211a_1 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_225_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=4.875e+11p pd=4.1e+06u as=4.4525e+11p ps=3.97e+06u
-M1001 a_79_21# C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=7.7e+11p pd=5.54e+06u as=1.07e+12p ps=8.14e+06u
-M1002 VPWR B1 a_79_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_540_47# B1 a_225_47# VNB nshort w=650000u l=150000u
-+  ad=3.64e+11p pd=2.42e+06u as=0p ps=0u
-M1004 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1005 a_79_21# A2 a_315_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.45e+11p ps=2.69e+06u
-M1006 a_79_21# C1 a_540_47# VNB nshort w=650000u l=150000u
-+  ad=2.275e+11p pd=2e+06u as=0p ps=0u
-M1007 a_315_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1009 VGND A1 a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_225_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VPWR A1 a_315_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 X a_79_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_225_47# B1 a_540_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR C1 a_79_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_540_47# C1 a_79_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 X a_79_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_79_21# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_315_297# A2 a_79_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND A2 a_225_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_2.cdl b/cells/o211a/sky130_fd_sc_hdll__o211a_2.cdl
index e5cb771..2906ab7 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_2.cdl
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o211a_2 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o211a_2
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_2.netlist.tsv b/cells/o211a/sky130_fd_sc_hdll__o211a_2.netlist.tsv
index 139eb60..2ea14c3 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_2.netlist.tsv
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__o211a_2	A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_2.spice b/cells/o211a/sky130_fd_sc_hdll__o211a_2.spice
index 3fa2182..0dce320 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_2.spice
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__o211a_2 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.12e+12p pd=8.24e+06u as=3e+11p ps=2.6e+06u
-M1001 a_120_47# C1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=1.82e+11p pd=1.86e+06u as=2.0475e+11p ps=1.93e+06u
-M1002 VPWR C1 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.055e+12p ps=6.11e+06u
-M1003 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_206_47# B1 a_120_47# VNB nshort w=650000u l=150000u
-+  ad=3.7375e+11p pd=3.75e+06u as=0p ps=0u
-M1005 a_206_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.4425e+11p ps=6.19e+06u
-M1006 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=2.34e+11p pd=2.02e+06u as=0p ps=0u
-M1007 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_47# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A1 a_206_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_406_297# A2 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=2.3e+11p pd=2.46e+06u as=0p ps=0u
-M1011 VPWR A1 a_406_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_47# C1 a_120_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_27_47# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VGND A2 a_206_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_206_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_120_47# B1 a_206_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_406_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VPWR B1 a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_27_47# A2 a_406_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_4.cdl b/cells/o211a/sky130_fd_sc_hdll__o211a_4.cdl
index 85a5129..afd5370 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_4.cdl
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o211a_4 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o211a_4
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_4.netlist.tsv b/cells/o211a/sky130_fd_sc_hdll__o211a_4.netlist.tsv
index 616df16..39288fe 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_4.netlist.tsv
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__o211a_4	A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_4.spice b/cells/o211a/sky130_fd_sc_hdll__o211a_4.spice
index 84abe88..bd9a093 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_4.spice
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__o211a_4 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_524_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=8.0275e+11p pd=7.67e+06u as=1.06925e+12p ps=9.79e+06u
-M1001 a_80_21# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.09e+12p pd=8.18e+06u as=1.795e+12p ps=1.559e+07u
-M1002 VPWR B1 a_80_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A2 a_524_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR C1 a_80_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_80_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=6e+11p ps=5.2e+06u
-M1006 a_80_21# A2 a_1010_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3e+11p ps=2.6e+06u
-M1007 a_524_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_524_47# B1 a_818_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.5275e+11p ps=1.77e+06u
-M1009 X a_80_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=0p ps=0u
-M1010 VPWR a_80_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_1202_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3e+11p ps=2.6e+06u
-M1012 X a_80_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_80_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_80_21# C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_607_47# B1 a_524_47# VNB nshort w=650000u l=150000u
-+  ad=1.365e+11p pd=1.72e+06u as=0p ps=0u
-M1016 VGND A1 a_524_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_80_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1010_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_80_21# C1 a_607_47# VNB nshort w=650000u l=150000u
-+  ad=3.5425e+11p pd=2.39e+06u as=0p ps=0u
-M1020 a_1202_297# A2 a_80_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_80_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_80_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_818_47# C1 a_80_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_80_21# A2 a_1202_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VPWR B1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_1202_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_524_47# B1 a_607_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VGND a_80_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_1010_297# A2 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR a_80_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VPWR a_80_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_80_21# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VPWR A1 a_1010_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 VGND A1 a_524_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_80_21# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VPWR C1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_607_47# C1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 a_524_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_818_47# B1 a_524_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 VGND A2 a_524_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 VGND a_80_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_80_21# C1 a_818_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 a_524_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.cdl b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.cdl
index 9f5347a..f615b57 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.cdl
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o211ai_1 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o211ai_1
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.netlist.tsv b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.netlist.tsv
index 5b6a05c..3a627aa 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.netlist.tsv
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.spice b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.spice
index c588a5e..bcc156d 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.spice
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__o211ai_1 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=3.9325e+11p ps=3.81e+06u
-M1001 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A2 a_118_297# VPB phighvt w=1e+06u l=180000u
-+  ad=9.2e+11p pd=5.84e+06u as=2.3e+11p ps=2.46e+06u
-M1003 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=6.2e+11p pd=5.24e+06u as=0p ps=0u
-M1004 Y C1 a_304_47# VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=2.46e+06u as=2.4375e+11p ps=2.05e+06u
-M1005 a_118_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_304_47# B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_27_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_304_47# C1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR A1 a_118_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND A2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_27_47# B1 a_304_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_118_297# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.cdl b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.cdl
index 3161a46..5671f1d 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.cdl
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o211ai_2 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o211ai_2
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.netlist.tsv b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.netlist.tsv
index 241bf91..f6d190f 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.netlist.tsv
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.spice b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.spice
index 08e7279..e6ba9f4 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.spice
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__o211ai_2 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_316_47# B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=6.63e+11p pd=5.94e+06u as=6.175e+11p ps=5.8e+06u
-M1001 Y A2 a_527_297# VPB phighvt w=1e+06u l=180000u
-+  ad=9e+11p pd=7.8e+06u as=8.5e+11p ps=7.7e+06u
-M1002 a_27_47# B1 a_316_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.15e+12p pd=1.03e+07u as=0p ps=0u
-M1004 a_316_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=6.1425e+11p ps=5.79e+06u
-M1005 VPWR A1 a_527_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_47# C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.145e+11p ps=1.96e+06u
-M1008 a_527_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_316_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A1 a_316_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A2 a_316_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_527_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y C1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A2 a_527_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y C1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_527_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VPWR A1 a_527_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_316_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_27_47# B1 a_316_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_527_297# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_316_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VGND A1 a_316_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VGND A2 a_316_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_27_47# C1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_316_47# B1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.cdl b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.cdl
index f4f94f2..5b6c1a6 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.cdl
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o211ai_4 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o211ai_4
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.netlist.tsv b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.netlist.tsv
index 691ede5..170107a 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.netlist.tsv
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.spice b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.spice
index 2f3a23c..5911edd 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.spice
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hdll__o211ai_4 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.586e+12p pd=1.398e+07u as=8.32e+11p ps=7.76e+06u
-M1001 VPWR C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=2.48e+12p pd=1.896e+07u as=1.77e+12p ps=1.554e+07u
-M1002 Y A2 a_118_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2e+12p ps=1.04e+07u
-M1003 VGND A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_886_47# C1 Y VNB nshort w=650000u l=150000u
-+  ad=4.225e+11p pd=3.9e+06u as=4.485e+11p ps=3.98e+06u
-M1005 Y C1 a_1088_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1006 Y B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_886_47# B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1088_47# B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_118_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_47# B1 a_886_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_118_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A1 a_118_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_47# B1 a_1464_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.47e+11p ps=2.06e+06u
-M1019 Y C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1464_47# C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_118_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR A1 a_118_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_118_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y C1 a_886_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A2 a_118_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_27_47# B1 a_1088_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_27_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_27_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR A1 a_118_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND A2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_27_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y C1 a_1464_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Y C1 a_886_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_27_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VGND A1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 Y A2 a_118_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_118_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VGND A2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_886_47# B1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VGND A1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_1088_47# C1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 Y A2 a_118_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 a_27_47# B1 a_886_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 a_118_297# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 a_886_47# C1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_118_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 VPWR A1 a_118_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 a_118_297# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 a_1464_47# B1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_1.cdl b/cells/o21a/sky130_fd_sc_hdll__o21a_1.cdl
index b0aaf0b..8c9defc 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_1.cdl
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21a_1 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21a_1
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_1.netlist.tsv b/cells/o21a/sky130_fd_sc_hdll__o21a_1.netlist.tsv
index 0f22cc9..4ed9b84 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_1.netlist.tsv
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__o21a_1	A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_1.spice b/cells/o21a/sky130_fd_sc_hdll__o21a_1.spice
index 18d75ae..098d5aa 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_1.spice
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__o21a_1 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 VPWR a_83_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.255e+12p pd=6.51e+06u as=2.9e+11p ps=2.58e+06u
-M1001 a_394_297# A2 a_83_21# VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=3.6e+11p ps=2.72e+06u
-M1002 VGND a_83_21# X VNB nshort w=650000u l=150000u
-+  ad=3.835e+11p pd=3.78e+06u as=1.82e+11p ps=1.86e+06u
-M1003 a_302_47# B1 a_83_21# VNB nshort w=650000u l=150000u
-+  ad=3.445e+11p pd=3.66e+06u as=1.7225e+11p ps=1.83e+06u
-M1004 VGND A2 a_302_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_83_21# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_394_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_302_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B1 a_83_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND A1 a_302_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 X a_83_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_302_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 X a_83_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_83_21# B1 a_302_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_83_21# A2 a_394_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_394_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_2.cdl b/cells/o21a/sky130_fd_sc_hdll__o21a_2.cdl
index 079cb11..17112b7 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_2.cdl
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21a_2 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21a_2
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_2.netlist.tsv b/cells/o21a/sky130_fd_sc_hdll__o21a_2.netlist.tsv
index 9730156..6441213 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_2.netlist.tsv
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__o21a_2	A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_2.spice b/cells/o21a/sky130_fd_sc_hdll__o21a_2.spice
index 51834e1..e2aa90c 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_2.spice
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__o21a_2 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 a_79_21# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=1.365e+12p ps=8.73e+06u
-M1001 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1002 a_414_47# B1 a_79_21# VNB nshort w=650000u l=150000u
-+  ad=3.8675e+11p pd=3.79e+06u as=2.0475e+11p ps=1.93e+06u
-M1003 a_414_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.1825e+11p ps=6.11e+06u
-M1004 VGND A2 a_414_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.1125e+11p pd=1.95e+06u as=0p ps=0u
-M1006 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_508_297# A2 a_79_21# VPB phighvt w=1e+06u l=180000u
-+  ad=5e+11p pd=3e+06u as=0p ps=0u
-M1008 VPWR A1 a_508_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_79_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 X a_79_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VPWR B1 a_79_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_79_21# A2 a_508_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND A1 a_414_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_79_21# B1 a_414_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_414_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_508_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VGND a_79_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 X a_79_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_4.cdl b/cells/o21a/sky130_fd_sc_hdll__o21a_4.cdl
index 2345c0b..6ab9f00 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_4.cdl
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21a_4 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21a_4
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_4.netlist.tsv b/cells/o21a/sky130_fd_sc_hdll__o21a_4.netlist.tsv
index c6653d3..cd946b9 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_4.netlist.tsv
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__o21a_4	A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_4.spice b/cells/o21a/sky130_fd_sc_hdll__o21a_4.spice
index d040da2..4b1a360 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_4.spice
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__o21a_4 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 X a_80_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6e+11p pd=5.2e+06u as=1.76e+12p ps=1.352e+07u
-M1001 a_80_21# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6.5e+11p pd=5.3e+06u as=0p ps=0u
-M1002 X a_80_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_525_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=8.84e+11p pd=7.92e+06u as=1.0075e+12p ps=9.6e+06u
-M1004 a_80_21# A2 a_826_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.5e+11p ps=2.5e+06u
-M1005 X a_80_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.29e+11p pd=3.92e+06u as=0p ps=0u
-M1006 VGND a_80_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_525_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A1 a_1008_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3e+11p ps=2.6e+06u
-M1009 X a_80_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_80_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B1 a_80_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_525_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_525_47# B1 a_80_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1014 a_826_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_80_21# B1 a_525_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A1 a_525_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_80_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_80_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1008_297# A2 a_80_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_80_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_525_47# B1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_80_21# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND a_80_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VPWR a_80_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VPWR B1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_826_297# A2 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR A1 a_826_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_80_21# A2 a_1008_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VGND A1 a_525_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VGND a_80_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_80_21# B1 a_525_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_525_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_525_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 a_1008_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 VGND A2 a_525_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.cdl b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.cdl
index bc85138..9e15df8 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.cdl
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21ai_1 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=0.7 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=0.7 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21ai_1
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.netlist.tsv b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.netlist.tsv
index 3d0196f..7f7baa8 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.netlist.tsv
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	0.7	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	1	0.7	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.spice b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.spice
index 03320d8..337c69c 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.spice
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hdll__o21ai_1 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 VPWR B1 Y VPB phighvt w=700000u l=180000u
-+  ad=6.515e+11p pd=5.03e+06u as=3.72e+11p ps=2.84e+06u
-M1001 Y A2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.3e+11p ps=2.46e+06u
-M1002 a_117_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=3.8025e+11p pd=2.47e+06u as=3.77e+11p ps=3.76e+06u
-M1004 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.535e+11p ps=2.08e+06u
-M1005 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=700000u l=180000u
+X1 VPWR A1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_27_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_27_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_117_297# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND A2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.cdl b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.cdl
index e5cdca0..eb37a11 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.cdl
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21ai_2 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21ai_2
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.netlist.tsv b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.netlist.tsv
index ae9be62..c4e4b99 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.netlist.tsv
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.spice b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.spice
index ac2f377..90d8e1e 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.spice
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__o21ai_2 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 a_29_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=8.7425e+11p pd=7.89e+06u as=5.005e+11p ps=4.14e+06u
-M1001 Y B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6e+11p pd=5.2e+06u as=9.95e+11p ps=7.99e+06u
-M1002 a_120_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6.7e+11p pd=5.34e+06u as=0p ps=0u
-M1003 a_120_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B1 a_29_47# VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=0p ps=0u
-M1005 VPWR A1 a_120_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_29_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A2 a_120_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A1 a_29_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_29_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A2 a_29_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A2 a_120_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_120_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VGND A1 a_29_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_120_297# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VPWR A1 a_120_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_29_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_29_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 Y B1 a_29_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VGND A2 a_29_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_29_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.cdl b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.cdl
index d9e1473..3ce886b 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.cdl
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21ai_4 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21ai_4
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.netlist.tsv b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.netlist.tsv
index f960312..ace8b91 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.netlist.tsv
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.spice b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.spice
index 6393947..4713c65 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.spice
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__o21ai_4 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 a_123_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.2e+12p pd=1.04e+07u as=1.2e+12p ps=1.04e+07u
-M1001 a_32_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.4625e+12p pd=1.36e+07u as=8.515e+11p ps=7.82e+06u
-M1002 a_32_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A1 a_123_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.49e+12p pd=1.298e+07u as=0p ps=0u
-M1004 a_123_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_32_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_32_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A2 a_123_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A2 a_32_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B1 a_32_47# VNB nshort w=650000u l=150000u
-+  ad=4.615e+11p pd=4.02e+06u as=0p ps=0u
-M1012 a_32_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A1 a_32_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A2 a_123_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A1 a_32_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y B1 a_32_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_32_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_32_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_123_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_123_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A1 a_123_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_123_297# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_32_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 Y A2 a_123_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y B1 a_32_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VPWR A1 a_123_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_123_297# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 Y A2 a_123_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_123_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 Y B1 a_32_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_32_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VPWR A1 a_123_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_32_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_32_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VGND A1 a_32_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_123_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 a_32_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 VGND A2 a_32_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 VGND A2 a_32_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 a_32_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VGND A1 a_32_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.cdl b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.cdl
index 21a5905..95e5370 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.cdl
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21ba_1 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nshort m=1 w=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.65 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21ba_1
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.netlist.tsv b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.netlist.tsv
index 8aa7d54..22b6f7a 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.netlist.tsv
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__o21ba_1	A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.spice b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.spice
index 8cefb13..a85e6cb 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.spice
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__o21ba_1 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 a_79_199# a_222_93# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=9.257e+11p ps=7.95e+06u
-M1001 a_222_93# B1_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1002 a_222_93# B1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=3.76e+11p ps=3.81e+06u
-M1003 a_460_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=4.29e+11p pd=3.92e+06u as=0p ps=0u
-M1004 VGND A2 a_460_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_79_199# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1006 VPWR A1 a_554_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1007 VGND a_79_199# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1008 a_554_297# A2 a_79_199# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_460_47# a_222_93# a_79_199# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.95e+11p ps=1.9e+06u
+X0 a_554_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_79_199# A2 a_554_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_79_199# a_222_93# a_460_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 X a_79_199# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND B1_N a_222_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR B1_N a_222_93# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 a_460_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VPWR a_222_93# a_79_199# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 X a_79_199# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VGND A1 a_460_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.cdl b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.cdl
index 25581ec..f0b9d48 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.cdl
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21ba_2 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nshort m=1 w=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.65 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21ba_2
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.netlist.tsv b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.netlist.tsv
index c9dc6e8..11a2543 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.netlist.tsv
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__o21ba_2	A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.spice b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.spice
index 402198e..310ae08 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.spice
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__o21ba_2 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 VPWR a_186_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.3807e+12p pd=8.86e+06u as=3.15e+11p ps=2.63e+06u
-M1001 a_186_21# a_27_93# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.45e+11p pd=2.69e+06u as=0p ps=0u
-M1002 VGND a_186_21# X VNB nshort w=650000u l=150000u
-+  ad=5.66e+11p pd=5.73e+06u as=2.5675e+11p ps=2.09e+06u
-M1003 X a_186_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_518_47# a_27_93# a_186_21# VNB nshort w=650000u l=150000u
-+  ad=4.4525e+11p pd=3.97e+06u as=1.69e+11p ps=1.82e+06u
-M1005 VPWR B1_N a_27_93# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1006 VGND A2 a_518_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_518_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_186_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_621_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.35e+11p ps=2.47e+06u
-M1010 a_621_297# A2 a_186_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B1_N a_27_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
+X0 a_27_93# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 X a_186_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_621_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_186_21# A2 a_621_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND a_186_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_27_93# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_186_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND A1 a_518_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 X a_186_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_518_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_186_21# a_27_93# a_518_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VPWR a_27_93# a_186_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.cdl b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.cdl
index b99ef31..8f94c66 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.cdl
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21ba_4 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21ba_4
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.netlist.tsv b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.netlist.tsv
index a970497..b42a534 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.netlist.tsv
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__o21ba_4	A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	2	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.spice b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.spice
index e4a8254..0dee33d 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.spice
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_hdll__o21ba_4 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 VPWR a_197_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.43e+12p pd=1.286e+07u as=5.8e+11p ps=5.16e+06u
-M1001 a_823_297# A2 a_197_21# VPB phighvt w=1e+06u l=180000u
-+  ad=8.5e+11p pd=7.7e+06u as=5.8e+11p ps=5.16e+06u
-M1002 VGND A2 a_635_47# VNB nshort w=650000u l=150000u
-+  ad=1.0335e+12p pd=9.68e+06u as=7.345e+11p ps=7.46e+06u
-M1003 a_635_47# a_27_297# a_197_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1004 VPWR B1_N a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.9e+11p ps=2.78e+06u
-M1005 a_635_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_197_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_197_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1008 a_197_21# A2 a_823_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_197_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_197_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_197_21# a_27_297# a_635_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A1 a_635_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_197_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_197_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_823_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_27_297# a_197_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND B1_N a_27_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.3075e+11p ps=2.01e+06u
-M1018 VPWR A1 a_823_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_635_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_197_21# a_27_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_197_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_197_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR a_197_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VGND a_197_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND A2 a_635_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_197_21# a_27_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_27_297# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_635_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_197_21# A2 a_823_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR A1 a_823_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 X a_197_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 X a_197_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_823_297# A2 a_197_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VPWR a_197_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_635_47# a_27_297# a_197_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 X a_197_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_635_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VPWR a_27_297# a_197_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_27_297# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 a_823_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 VGND A1 a_635_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 VGND a_197_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 a_197_21# a_27_297# a_635_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.cdl b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.cdl
index f65503b..dc30652 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.cdl
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21bai_1 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nshort m=1 w=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_hdll__o21bai_1
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.netlist.tsv b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.netlist.tsv
index 203af48..a6bb92b 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.netlist.tsv
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.65	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_hdll__o21bai_1.spice b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.spice
index 634c6a2..0a5626b 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.spice
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__o21bai_1 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_425_297# VPB phighvt w=1e+06u l=180000u
-+  ad=6.607e+11p pd=5.42e+06u as=2.8e+11p ps=2.56e+06u
-M1001 a_425_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.2e+11p ps=2.64e+06u
-M1002 a_105_352# B1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=3.615e+11p ps=3.5e+06u
-M1003 VGND A2 a_327_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.965e+11p ps=3.82e+06u
-M1004 a_327_47# a_105_352# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1005 a_327_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR B1_N a_105_352# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1007 Y a_105_352# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_425_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND A1 a_327_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 Y A2 a_425_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_327_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_105_352# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 Y a_105_352# a_327_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VGND B1_N a_105_352# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_105_352# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.cdl b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.cdl
index 3d8147c..de51444 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.cdl
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21bai_2 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N 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
-MMNA0 pndA A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nshort m=1 w=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_hdll__o21bai_2
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.netlist.tsv b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.netlist.tsv
index 1fd8be1..63f7271 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.netlist.tsv
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	2	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	2	0.65	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_hdll__o21bai_2.spice b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.spice
index a40d8f7..6c4e215 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.spice
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_hdll__o21bai_2 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 a_226_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=8.0925e+11p pd=7.69e+06u as=6.112e+11p ps=5.54e+06u
-M1001 a_226_47# a_28_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1002 Y a_28_297# a_226_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_28_297# B1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1004 VPWR B1_N a_28_297# VPB phighvt w=420000u l=180000u
-+  ad=8.657e+11p pd=7.83e+06u as=1.134e+11p ps=1.38e+06u
-M1005 VPWR a_28_297# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1006 a_226_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_437_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.5e+11p pd=7.7e+06u as=0p ps=0u
-M1008 VGND A1 a_226_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_28_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1 a_437_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_437_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A2 a_226_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A2 a_437_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_437_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_437_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 Y a_28_297# a_226_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_28_297# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 Y A2 a_437_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_226_47# a_28_297# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_226_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y a_28_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_226_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VPWR a_28_297# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_437_297# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VGND B1_N a_28_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND A2 a_226_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VGND A1 a_226_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.cdl b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.cdl
index b0aafc4..718b840 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.cdl
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21bai_4 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N 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
-MMNA0 pndA A1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21bai_4
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.netlist.tsv b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.netlist.tsv
index 40e487c..1ae4a58 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.netlist.tsv
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	4	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.spice b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.spice
index 3126953..f8e2eb1 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.spice
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_hdll__o21bai_4 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 a_621_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.43e+12p pd=1.286e+07u as=1.43e+12p ps=1.286e+07u
-M1001 Y a_33_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=0p ps=0u
-M1002 Y A2 a_621_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A1 a_621_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_245_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.3455e+12p pd=1.324e+07u as=1.1115e+12p ps=9.92e+06u
-M1005 VGND A1 a_245_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_245_47# a_33_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1007 a_245_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B1_N a_33_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1009 a_33_297# B1_N VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1010 VGND A2 a_245_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_33_297# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_621_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y a_33_297# a_245_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y a_33_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_621_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A2 a_621_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_245_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A2 a_245_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_245_47# a_33_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A1 a_245_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_33_297# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A1 a_621_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_245_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y a_33_297# a_245_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_621_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_33_297# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR A1 a_621_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_245_47# a_33_297# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_245_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_621_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_245_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR a_33_297# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 Y A2 a_621_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 Y a_33_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Y a_33_297# a_245_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VGND A1 a_245_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VGND B1_N a_33_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VGND A1 a_245_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VPWR A1 a_621_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 Y a_33_297# a_245_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_621_297# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VGND A2 a_245_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VPWR a_33_297# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 Y A2 a_621_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_245_47# a_33_297# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 VGND A2 a_245_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 Y a_33_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 a_621_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 a_621_297# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 a_245_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_245_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_1.cdl b/cells/o221a/sky130_fd_sc_hdll__o221a_1.cdl
index 0bb0a5c..025d676 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_1.cdl
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__o221a_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o221a_1
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_1.netlist.tsv b/cells/o221a/sky130_fd_sc_hdll__o221a_1.netlist.tsv
index 57415f9..e83471c 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_1.netlist.tsv
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__o221a_1	A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_1.spice b/cells/o221a/sky130_fd_sc_hdll__o221a_1.spice
index 3ca7053..6a315af 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_1.spice
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__o221a_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 a_124_47# B2 a_230_47# VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=3.9975e+11p ps=3.83e+06u
-M1001 VPWR A1 a_515_297# VPB phighvt w=1e+06u l=180000u
-+  ad=7e+11p pd=5.4e+06u as=2.3e+11p ps=2.46e+06u
-M1002 VGND A1 a_230_47# VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=0p ps=0u
-M1003 a_228_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.3e+11p pd=2.46e+06u as=0p ps=0u
-M1004 a_515_297# A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.14e+12p ps=6.28e+06u
-M1005 a_27_297# B2 a_228_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_27_297# VGND VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=0p ps=0u
-M1007 a_230_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_230_47# B1 a_124_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_27_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1010 a_124_47# C1 a_27_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1011 VPWR C1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B1 a_228_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND A2 a_230_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VPWR a_27_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_230_47# B2 a_124_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_124_47# B1 a_230_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_27_297# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND a_27_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_27_297# A2 a_515_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_230_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_515_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_27_297# C1 a_124_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_228_297# B2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_2.cdl b/cells/o221a/sky130_fd_sc_hdll__o221a_2.cdl
index f5731a8..7964bf2 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_2.cdl
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__o221a_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o221a_2
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_2.netlist.tsv b/cells/o221a/sky130_fd_sc_hdll__o221a_2.netlist.tsv
index e552b80..364e395 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_2.netlist.tsv
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__o221a_2	A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_2.spice b/cells/o221a/sky130_fd_sc_hdll__o221a_2.spice
index 04fae69..558e160 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_2.spice
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_hdll__o221a_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 a_255_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.45e+11p pd=2.49e+06u as=9.7e+11p ps=7.94e+06u
-M1001 a_245_47# B1 a_151_47# VNB nshort w=650000u l=150000u
-+  ad=3.9325e+11p pd=3.81e+06u as=3.9975e+11p ps=3.83e+06u
-M1002 a_151_47# C1 a_38_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.6975e+11p ps=2.13e+06u
-M1003 a_151_47# B2 a_245_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A1 a_245_47# VNB nshort w=650000u l=150000u
-+  ad=5.46e+11p pd=5.58e+06u as=0p ps=0u
-M1005 VPWR A1 a_535_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.3e+11p ps=2.46e+06u
-M1006 a_535_297# A2 a_38_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.13e+12p ps=6.26e+06u
-M1007 VPWR C1 a_38_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_245_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_38_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1010 a_38_47# B2 a_255_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_38_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.405e+11p ps=2.04e+06u
-M1012 X a_38_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_38_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_38_47# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_38_47# C1 a_151_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VGND a_38_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_38_47# A2 a_535_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_535_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND A2 a_245_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_245_47# B2 a_151_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VPWR B1 a_255_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 X a_38_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 X a_38_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_151_47# B1 a_245_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_255_297# B2 a_38_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VPWR a_38_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_245_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_4.cdl b/cells/o221a/sky130_fd_sc_hdll__o221a_4.cdl
index 3399ad2..b17e1ea 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_4.cdl
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__o221a_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o221a_4
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_4.netlist.tsv b/cells/o221a/sky130_fd_sc_hdll__o221a_4.netlist.tsv
index 9a323a0..eac67d2 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_4.netlist.tsv
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__o221a_4	A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_4.spice b/cells/o221a/sky130_fd_sc_hdll__o221a_4.spice
index e4fbaef..575077f 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_4.spice
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_hdll__o221a_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 a_307_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=7.67e+11p pd=7.56e+06u as=9.945e+11p ps=9.56e+06u
-M1001 VPWR C1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.22e+12p pd=1.644e+07u as=8.7e+11p ps=7.74e+06u
-M1002 a_27_47# C1 a_117_297# VNB nshort w=650000u l=150000u
-+  ad=8.19e+11p pd=7.72e+06u as=2.08e+11p ps=1.94e+06u
-M1003 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1004 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1005 VPWR A1 a_785_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1006 VPWR B1 a_305_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1007 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_117_297# C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A1 a_307_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_305_297# B2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_785_297# A2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_47# B1 a_307_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_307_47# B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_117_297# B2 a_305_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_307_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_117_297# C1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_117_297# A2 a_785_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_305_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_47# B2 a_307_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A2 a_307_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_785_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_307_47# B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_117_297# B2 a_305_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR A1 a_785_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_27_47# B1 a_307_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_27_47# B2 a_307_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_307_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR C1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_785_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_305_297# B2 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_117_297# C1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_307_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VPWR B1 a_305_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 X a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 X a_117_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_117_297# A2 a_785_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_27_47# C1 a_117_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 a_307_47# B2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_117_297# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VGND A1 a_307_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_307_47# B1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VPWR a_117_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 VGND A2 a_307_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 VGND a_117_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 a_305_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 a_785_297# A2 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.cdl b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.cdl
index 84d5aa9..1fc2475 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.cdl
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o221ai_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o221ai_1
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.netlist.tsv b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.netlist.tsv
index f87b53a..ac1dc35 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.netlist.tsv
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.spice b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.spice
index 6dcb608..a186abb 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.spice
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__o221ai_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 Y B2 a_351_297# VPB phighvt w=1e+06u l=180000u
-+  ad=7.6e+11p pd=5.52e+06u as=2.6e+11p ps=2.52e+06u
-M1001 VPWR C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.24e+12p pd=6.48e+06u as=0p ps=0u
-M1002 a_569_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=2.3e+11p pd=2.46e+06u as=0p ps=0u
-M1003 VPWR A1 a_569_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_123_47# C1 Y VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=2.145e+11p ps=1.96e+06u
-M1005 a_261_47# B2 a_123_47# VNB nshort w=650000u l=150000u
-+  ad=6.695e+11p pd=5.96e+06u as=0p ps=0u
-M1006 a_261_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1007 a_123_47# B1 a_261_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_261_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_351_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1 a_261_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 Y C1 a_123_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_569_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_261_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 Y A2 a_569_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_123_47# B2 a_261_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VPWR B1 a_351_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_261_47# B1 a_123_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_351_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.cdl b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.cdl
index 5423891..7c2d8c6 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.cdl
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o221ai_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o221ai_2
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.netlist.tsv b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.netlist.tsv
index 7be9861..3577547 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.netlist.tsv
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.spice b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.spice
index 8bd016f..b58318e 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.spice
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__o221ai_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 VPWR B1 a_410_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.745e+12p pd=1.149e+07u as=5.8e+11p ps=5.16e+06u
-M1001 VGND A2 a_320_47# VNB nshort w=650000u l=150000u
-+  ad=3.835e+11p pd=3.78e+06u as=1.1115e+12p ps=9.92e+06u
-M1002 Y C1 a_28_47# VNB nshort w=650000u l=150000u
-+  ad=2.08e+11p pd=1.94e+06u as=7.54e+11p ps=7.52e+06u
-M1003 a_28_47# B1 a_320_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_410_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.7e+11p ps=7.74e+06u
-M1005 a_802_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1006 Y C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_320_47# B2 a_28_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B2 a_410_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A1 a_320_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_410_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_802_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_320_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_28_47# C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_320_47# B1 a_28_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_28_47# B2 a_320_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_802_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_320_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A2 a_802_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_28_47# C1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 Y C1 a_28_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_320_47# B2 a_28_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND A2 a_320_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR B1 a_410_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_320_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_802_297# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_802_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR A1 a_802_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_320_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_410_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VGND A1 a_320_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 Y B2 a_410_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_28_47# B1 a_320_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_410_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_28_47# B2 a_320_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 Y A2 a_802_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_320_47# B1 a_28_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.cdl b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.cdl
index 5c62037..ec713ed 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.cdl
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o221ai_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o221ai_4
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.netlist.tsv b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.netlist.tsv
index b598b4f..cc94264 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.netlist.tsv
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.spice b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.spice
index d838324..dda274d 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.spice
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_hdll__o221ai_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 Y C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.74e+12p pd=1.548e+07u as=2.645e+12p ps=1.929e+07u
-M1001 a_601_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=0p ps=0u
-M1002 Y A2 a_1369_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1003 a_1369_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_511_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.976e+12p pd=1.778e+07u as=7.67e+11p ps=7.56e+06u
-M1005 a_1369_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y C1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=1.391e+12p ps=1.338e+07u
-M1007 a_511_47# B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A1 a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B2 a_601_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_511_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR B1 a_601_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A1 a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A2 a_1369_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_47# C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A2 a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_601_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_511_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y C1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_47# B1 a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1369_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_511_47# B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_601_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR A1 a_1369_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_27_47# B2 a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR B1 a_601_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_511_47# B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y B2 a_601_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_27_47# C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_511_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_511_47# B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_601_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR A1 a_1369_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND A2 a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_27_47# B1 a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1369_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_27_47# B2 a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_601_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR A1 a_1369_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 Y B2 a_601_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 Y B2 a_601_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_601_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_27_47# C1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y C1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND A2 a_511_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_1369_297# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_511_47# B1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_27_47# B2 a_511_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VGND A1 a_511_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 Y C1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_511_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VGND A2 a_511_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_511_47# B1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_601_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_511_47# B2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 VGND A1 a_511_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 VPWR B1 a_601_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 a_601_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 a_511_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 Y A2 a_1369_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 a_27_47# C1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 a_1369_297# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 a_1369_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 a_511_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 a_27_47# B1 a_511_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 VPWR B1 a_601_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 Y A2 a_1369_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 a_511_47# B2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X34 a_511_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X35 a_1369_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X36 a_27_47# B1 a_511_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X37 a_27_47# B2 a_511_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X38 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X39 VPWR A1 a_1369_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_1.cdl b/cells/o22a/sky130_fd_sc_hdll__o22a_1.cdl
index 8e4c766..9786a05 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_1.cdl
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o22a_1 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o22a_1
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_1.netlist.tsv b/cells/o22a/sky130_fd_sc_hdll__o22a_1.netlist.tsv
index a532ef4..27ab191 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_1.netlist.tsv
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__o22a_1	A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_1.spice b/cells/o22a/sky130_fd_sc_hdll__o22a_1.spice
index 115a14e..1c12e61 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_1.spice
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__o22a_1 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 VGND A2 a_219_47# VNB nshort w=650000u l=150000u
-+  ad=3.835e+11p pd=3.78e+06u as=6.565e+11p ps=5.92e+06u
-M1001 VPWR a_83_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=9.8e+11p pd=5.96e+06u as=2.9e+11p ps=2.58e+06u
-M1002 VPWR A1 a_511_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3e+11p ps=2.6e+06u
-M1003 a_83_21# B2 a_299_297# VPB phighvt w=1e+06u l=180000u
-+  ad=4.1e+11p pd=2.82e+06u as=2.9e+11p ps=2.58e+06u
-M1004 a_219_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_299_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_83_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.82e+11p ps=1.86e+06u
-M1007 a_511_297# A2 a_83_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_83_21# B1 a_219_47# VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=0p ps=0u
-M1009 a_219_47# B2 a_83_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B1 a_299_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 X a_83_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 X a_83_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_83_21# A2 a_511_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_511_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_219_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VGND A1 a_219_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_83_21# B2 a_219_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_299_297# B2 a_83_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_219_47# B1 a_83_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_2.cdl b/cells/o22a/sky130_fd_sc_hdll__o22a_2.cdl
index 09fde89..7bbe464 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_2.cdl
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o22a_2 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o22a_2
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_2.netlist.tsv b/cells/o22a/sky130_fd_sc_hdll__o22a_2.netlist.tsv
index a32dcff..3d348a3 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_2.netlist.tsv
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__o22a_2	A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_2.spice b/cells/o22a/sky130_fd_sc_hdll__o22a_2.spice
index 03b4dc6..9d1d6cd 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_2.spice
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__o22a_2 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_321_47# B2 a_83_21# VNB nshort w=650000u l=150000u
-+  ad=7.02e+11p pd=6.06e+06u as=1.755e+11p ps=1.84e+06u
-M1001 X a_83_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=1.38e+12p ps=8.76e+06u
-M1002 a_627_297# A2 a_83_21# VPB phighvt w=1e+06u l=180000u
-+  ad=2.3e+11p pd=2.46e+06u as=4.9e+11p ps=2.98e+06u
-M1003 VPWR A1 a_627_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_321_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.655e+11p ps=5.64e+06u
-M1005 a_411_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.3e+11p pd=2.46e+06u as=0p ps=0u
-M1006 X a_83_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
-M1007 a_83_21# B2 a_411_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_321_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_83_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_83_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_83_21# B1 a_321_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_411_297# B2 a_83_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_83_21# A2 a_627_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_321_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR B1 a_411_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND a_83_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VPWR a_83_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND A1 a_321_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_83_21# B2 a_321_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_321_47# B1 a_83_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_627_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 X a_83_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 X a_83_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_4.cdl b/cells/o22a/sky130_fd_sc_hdll__o22a_4.cdl
index d48fe0c..0ec8348 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_4.cdl
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o22a_4 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o22a_4
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_4.netlist.tsv b/cells/o22a/sky130_fd_sc_hdll__o22a_4.netlist.tsv
index 496bb22..2d732c3 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_4.netlist.tsv
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__o22a_4	A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_4.spice b/cells/o22a/sky130_fd_sc_hdll__o22a_4.spice
index 79a3b89..e45a899 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_4.spice
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__o22a_4 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 VGND A1 a_524_47# VNB nshort w=650000u l=150000u
-+  ad=9.425e+11p pd=9.4e+06u as=1.1115e+12p ps=9.92e+06u
-M1001 X a_96_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=2.055e+12p ps=1.411e+07u
-M1002 a_1006_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1003 a_614_297# B2 a_96_21# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=5.8e+11p ps=5.16e+06u
-M1004 a_524_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_96_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_96_21# B2 a_614_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_96_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1008 VGND a_96_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_524_47# B1 a_96_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.835e+11p ps=3.78e+06u
-M1010 a_96_21# B2 a_524_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_1006_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A2 a_524_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_614_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_96_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_96_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_524_47# B2 a_96_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1006_297# A2 a_96_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_96_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_96_21# B1 a_524_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_524_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_96_21# A2 a_1006_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_96_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR B1 a_614_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_96_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_524_47# B1 a_96_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_524_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 X a_96_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 X a_96_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_524_47# B2 a_96_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_1006_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND a_96_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_614_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR A1 a_1006_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VPWR a_96_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_96_21# A2 a_1006_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_96_21# B2 a_614_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_524_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VGND A1 a_524_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VGND A2 a_524_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_1006_297# A2 a_96_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 VGND a_96_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 X a_96_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_614_297# B2 a_96_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 a_96_21# B2 a_524_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 VPWR a_96_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 VPWR B1 a_614_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 a_96_21# B1 a_524_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.cdl b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.cdl
index a280c89..859eace 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.cdl
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o22ai_1 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o22ai_1
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.netlist.tsv b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.netlist.tsv
index 33a2398..b56a45a 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.netlist.tsv
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.spice b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.spice
index e07bcbc..e1c051d 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.spice
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__o22ai_1 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 VGND A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=7.605e+11p ps=6.24e+06u
-M1001 VPWR A1 a_384_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.5e+11p pd=5.1e+06u as=2.3e+11p ps=2.46e+06u
-M1002 a_384_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.6e+11p ps=3.12e+06u
-M1003 a_27_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.5675e+11p ps=2.09e+06u
-M1004 a_117_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=4.15e+11p pd=2.83e+06u as=0p ps=0u
-M1005 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 Y A2 a_384_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_384_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VPWR B1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_117_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_27_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y B2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_27_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.cdl b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.cdl
index c3c5b48..a0ad8cf 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.cdl
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o22ai_2 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o22ai_2
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.netlist.tsv b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.netlist.tsv
index 242f75c..0525796 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.netlist.tsv
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.spice b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.spice
index f9faef0..5025484 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.spice
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__o22ai_2 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 Y A2 a_515_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=8.7e+11p ps=7.74e+06u
-M1001 VPWR B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=8.7e+11p ps=7.74e+06u
-M1002 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.2415e+12p pd=1.032e+07u as=4.81e+11p ps=4.08e+06u
-M1003 a_27_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=4.81e+11p pd=4.08e+06u as=0p ps=0u
-M1007 a_27_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_515_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1 a_515_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_515_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_515_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 Y B1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_27_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 Y A2 a_515_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y B2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VGND A2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_27_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND A1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_27_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Y B2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_515_297# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VPWR A1 a_515_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_27_47# B2 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_27_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_27_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VPWR B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.cdl b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.cdl
index 3dfca95..fb72e82 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.cdl
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o22ai_4 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o22ai_4
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.netlist.tsv b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.netlist.tsv
index 0ecbf08..d6dacc8 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.netlist.tsv
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.spice b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.spice
index 18a6783..7421e1c 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.spice
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hdll__o22ai_4 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 Y A2 a_123_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=1.16e+12p ps=1.032e+07u
-M1001 Y B2 a_885_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1002 a_33_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.924e+12p pd=1.762e+07u as=7.995e+11p ps=7.66e+06u
-M1003 a_885_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.49e+12p ps=1.298e+07u
-M1004 Y B1 a_33_47# VNB nshort w=650000u l=150000u
-+  ad=7.995e+11p pd=7.66e+06u as=0p ps=0u
-M1005 a_33_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_33_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_123_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_885_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_33_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B2 a_33_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_123_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A1 a_123_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y B2 a_885_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B1 a_33_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_123_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A2 a_33_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_33_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_885_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A1 a_33_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_33_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y B2 a_33_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A2 a_123_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR B1 a_885_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_33_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_123_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A2 a_33_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_123_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_885_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_33_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR B1 a_885_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A1 a_33_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_33_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VGND A2 a_33_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 Y B2 a_33_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 Y B1 a_33_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 Y B1 a_33_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 Y B2 a_885_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_33_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y B2 a_33_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 Y A2 a_123_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_885_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_123_297# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VPWR B1 a_885_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_33_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_123_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_885_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_33_47# B2 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_885_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_33_47# B2 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 VPWR B1 a_885_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_33_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 VPWR A1 a_123_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 Y A2 a_123_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 a_33_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VGND A1 a_33_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 a_123_297# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 a_33_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 Y B2 a_885_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 a_885_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 a_123_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 VGND A2 a_33_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 VGND A1 a_33_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 VPWR A1 a_123_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.cdl b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.cdl
index 41ed289..5128a8f 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.cdl
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__o2bb2a_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand0 VGND A1_N VNB 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.0 l=0.18 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 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
-MMPaoi11 sndPB1 B2 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
-MMPaoi20 y inand VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMPaoi20 y inand VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o2bb2a_1
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.netlist.tsv b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.netlist.tsv
index 49409e3..4187536 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.netlist.tsv
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	y	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inand	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.65	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.0	0.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.spice b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.spice
index 6cf2e40..9c353cd 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.spice
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__o2bb2a_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 VPWR A2_N a_224_369# VPB phighvt w=420000u l=180000u
-+  ad=8.398e+11p pd=6.8e+06u as=2.664e+11p ps=2.4e+06u
-M1001 a_225_47# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.323e+11p pd=1.47e+06u as=3.9885e+11p ps=3.76e+06u
-M1002 VPWR a_76_199# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1003 VGND B2 a_529_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1004 a_224_369# A2_N a_225_47# VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1005 a_633_369# B2 a_76_199# VPB phighvt w=420000u l=180000u
-+  ad=1.638e+11p pd=1.62e+06u as=1.47e+11p ps=1.54e+06u
-M1006 a_224_369# A1_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B1 a_633_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_529_47# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_76_199# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1010 a_529_47# a_224_369# a_76_199# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1011 a_76_199# a_224_369# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_633_369# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VGND B1 a_529_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_76_199# B2 a_633_369# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 X a_76_199# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_76_199# a_224_369# a_529_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR A1_N a_224_369# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 a_225_47# A2_N a_224_369# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 X a_76_199# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VGND A1_N a_225_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_224_369# a_76_199# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X10 a_224_369# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X11 a_529_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.cdl b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.cdl
index 447c1ee..faeeb13 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.cdl
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__o2bb2a_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand0 VGND A1_N VNB 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.0 l=0.18 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inand VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMPaoi20 y inand VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o2bb2a_2
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.netlist.tsv b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.netlist.tsv
index ab35aaf..56ef1b4 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.netlist.tsv
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	y	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inand	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.65	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.0	0.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.spice b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.spice
index 0bb9679..b43fff7 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.spice
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_hdll__o2bb2a_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 a_321_369# A2_N a_313_47# VNB nshort w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=1.596e+11p ps=1.6e+06u
-M1001 a_321_369# A1_N VPWR VPB phighvt w=640000u l=180000u
-+  ad=3.652e+11p pd=2.86e+06u as=1.2558e+12p ps=9.86e+06u
-M1002 a_627_47# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.541e+11p pd=2.89e+06u as=5.4595e+11p ps=5.41e+06u
-M1003 X a_84_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.08e+11p pd=1.94e+06u as=0p ps=0u
-M1004 a_627_47# a_321_369# a_84_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1005 a_84_21# a_321_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.984e+11p pd=1.9e+06u as=0p ps=0u
-M1006 VPWR B1 a_723_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=2.208e+11p ps=1.97e+06u
-M1007 VPWR a_84_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1008 VPWR A2_N a_321_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_723_369# B2 a_84_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B2 a_627_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_84_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_313_47# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_84_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1_N a_313_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_84_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VGND a_84_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND B1 a_627_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 X a_84_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_723_369# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X6 VPWR a_321_369# a_84_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X7 VPWR a_84_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR A1_N a_321_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X9 a_84_21# B2 a_723_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X10 a_84_21# a_321_369# a_627_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_313_47# A2_N a_321_369# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_627_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_321_369# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
 .ends
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.cdl b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.cdl
index 9d510e6..65a174a 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.cdl
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__o2bb2a_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand0 VGND A1_N VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inand VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi10 nmid B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi20 y inand VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inand VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A1_N VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 y inand VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o2bb2a_4
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.netlist.tsv b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.netlist.tsv
index 44f0d9d..f9420ba 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.netlist.tsv
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inand	nmid	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inand	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.65	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.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inand	nmid	VNB	nfet_01v8	2	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inand	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.spice b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.spice
index 051835a..cc128aa 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.spice
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_hdll__o2bb2a_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 a_787_47# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=3.835e+11p pd=3.78e+06u as=1.1375e+12p ps=1.13e+07u
-M1001 a_211_297# B2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=5.8e+11p ps=5.16e+06u
-M1002 X a_211_297# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1003 X a_211_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=2.51e+12p ps=1.902e+07u
-M1004 VPWR A1_N a_455_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1005 VPWR a_455_21# a_211_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=8.19e+11p pd=7.72e+06u as=0p ps=0u
-M1007 VGND a_211_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_211_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_117_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A1_N a_787_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_211_297# a_455_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_211_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_455_21# A2_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR B1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_211_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_787_47# A2_N a_455_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.405e+11p ps=2.04e+06u
-M1017 VGND B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A2_N a_455_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_211_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_47# a_455_21# a_211_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1022 a_211_297# a_455_21# a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_117_297# B2 a_211_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_211_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_455_21# A2_N a_787_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_455_21# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_455_21# a_211_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR A1_N a_455_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_27_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_211_297# a_455_21# a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 X a_211_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_787_47# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR B1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_455_21# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_27_47# a_455_21# a_211_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_117_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_787_47# A2_N a_455_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 X a_211_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_211_297# B2 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 X a_211_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VPWR a_211_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VGND B1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 X a_211_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 VGND B2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 VPWR A2_N a_455_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_27_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_117_297# B2 a_211_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VGND A1_N a_787_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 VGND a_211_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VPWR a_211_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 a_455_21# A2_N a_787_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 VGND a_211_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 a_211_297# a_455_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 a_455_21# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.cdl b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.cdl
index 334c8b6..023db07 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.cdl
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o2bb2ai_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A1_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi10 nmid B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 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
-MMPaoi11 sndPB1 B2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi20 Y inand VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand 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
+MMPnand0 inand A1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o2bb2ai_1
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.netlist.tsv b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.netlist.tsv
index b2661e4..00f1e22 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.netlist.tsv
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	1	0.65	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	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nfet_01v8	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	1	0.65	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	0.18	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	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.spice b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.spice
index 171beb0..8d57d9d 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.spice
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__o2bb2ai_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 a_120_297# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=1.275e+12p ps=8.55e+06u
-M1001 a_396_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=4.225e+11p pd=3.9e+06u as=3.8675e+11p ps=3.79e+06u
-M1002 Y a_120_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.1e+11p pd=2.62e+06u as=0p ps=0u
-M1003 VPWR B1 a_492_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1004 a_120_297# A2_N a_122_47# VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=1.755e+11p ps=1.84e+06u
-M1005 a_396_47# a_120_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1006 a_122_47# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_492_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A2_N a_120_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B2 a_396_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_120_297# a_396_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VGND B1 a_396_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VPWR A1_N a_120_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_396_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND A1_N a_122_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_122_47# A2_N a_120_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR a_120_297# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_492_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_120_297# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Y B2 a_492_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.cdl b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.cdl
index 59a567e..0ba470f 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.cdl
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o2bb2ai_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A1_N VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi10 nmid B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi20 Y inand VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A1_N VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o2bb2ai_2
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.netlist.tsv b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.netlist.tsv
index a5871f2..6c1764f 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.netlist.tsv
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nfet_01v8	2	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	2	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.spice b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.spice
index 29b469e..e8338ae 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.spice
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__o2bb2ai_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 a_121_297# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.9e+11p pd=5.18e+06u as=1.96e+12p ps=1.392e+07u
-M1001 a_121_297# A2_N a_123_47# VNB nshort w=650000u l=150000u
-+  ad=2.405e+11p pd=2.04e+06u as=3.575e+11p ps=3.7e+06u
-M1002 a_503_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=8.7425e+11p pd=7.89e+06u as=7.345e+11p ps=7.46e+06u
-M1003 VPWR A1_N a_121_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A1_N a_123_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_788_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=5.8e+11p ps=5.16e+06u
-M1006 a_123_47# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_121_297# A2_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B2 a_788_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_121_297# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_503_47# a_121_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1011 a_123_47# A2_N a_121_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y a_121_297# a_503_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_503_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_788_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A2_N a_121_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y a_121_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND B2 a_503_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND B1 a_503_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR B1 a_788_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B2 a_788_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_503_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_788_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 Y a_121_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND A1_N a_123_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VGND B1 a_503_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR a_121_297# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_123_47# A2_N a_121_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_788_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR A1_N a_121_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VPWR B1 a_788_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 Y a_121_297# a_503_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VGND B2 a_503_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_121_297# A2_N a_123_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_121_297# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_503_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_503_47# a_121_297# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VPWR A2_N a_121_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 a_123_47# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_121_297# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.cdl b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.cdl
index ffb6e46..3975fb4 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.cdl
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o2bb2ai_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A1_N VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi10 nmid B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi20 Y inand VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A1_N VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o2bb2ai_4
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.netlist.tsv b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.netlist.tsv
index 656bd6f..3a190a5 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.netlist.tsv
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nfet_01v8	4	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.spice b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.spice
index 2fd6584..ef3fed1 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.spice
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_hdll__o2bb2ai_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 VGND B2 a_887_47# VNB nshort w=650000u l=150000u
-+  ad=1.3455e+12p pd=1.194e+07u as=1.6315e+12p ps=1.412e+07u
-M1001 a_113_47# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=3.08e+12p ps=2.416e+07u
-M1002 a_113_47# A2_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_47# A2_N a_113_47# VNB nshort w=650000u l=150000u
-+  ad=9.425e+11p pd=9.4e+06u as=4.485e+11p ps=3.98e+06u
-M1004 VPWR a_113_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1005 VPWR B1 a_1361_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.43e+12p ps=1.286e+07u
-M1006 Y a_113_47# a_887_47# VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1007 Y a_113_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_887_47# a_113_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B1 a_887_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A2_N a_113_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B2 a_1361_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_887_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_887_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1361_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A1_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND B2 a_887_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_47# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_113_47# A2_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_113_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR B1 a_1361_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_113_47# A2_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_47# A2_N a_113_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A1_N a_113_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1361_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1361_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND B1 a_887_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_887_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_887_47# a_113_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A2_N a_113_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y B2 a_1361_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A1_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1361_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y a_113_47# a_887_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_887_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_113_47# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y a_113_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_113_47# A2_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_27_47# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR A1_N a_113_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_887_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VPWR B1 a_1361_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_887_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_113_47# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_27_47# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_113_47# A2_N a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_27_47# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_27_47# A2_N a_113_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_113_47# A2_N a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VGND B1 a_887_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_1361_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 Y a_113_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VPWR A2_N a_113_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 Y B2 a_1361_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_1361_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VPWR A1_N a_113_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VPWR a_113_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 Y B2 a_1361_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VPWR B1 a_1361_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_113_47# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VGND A1_N a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 VGND A1_N a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_887_47# a_113_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VGND B2 a_887_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 VGND B2 a_887_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_113_47# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 VPWR A1_N a_113_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 a_1361_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 VGND B1 a_887_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 VPWR a_113_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 a_1361_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 a_27_47# A2_N a_113_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X32 Y a_113_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 Y a_113_47# a_887_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X34 VPWR A2_N a_113_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 a_887_47# a_113_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X36 Y a_113_47# a_887_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X37 a_887_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X38 a_113_47# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X39 a_887_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.cdl b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.cdl
index 0782d51..5ca922c 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.cdl
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o31ai_1 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o31ai_1
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.netlist.tsv b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.netlist.tsv
index 7d22007..3eb26e7 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.netlist.tsv
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.spice b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.spice
index 57a3887..d255b2a 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.spice
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__o31ai_1 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 a_117_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=5.4e+11p ps=5.08e+06u
-M1001 VGND A2 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=5.33e+11p ps=4.24e+06u
-M1002 Y B1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=2.535e+11p pd=2.08e+06u as=0p ps=0u
-M1003 Y A3 a_213_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=3.16e+06u as=2.9e+11p ps=2.58e+06u
-M1004 a_119_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_119_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_213_297# A2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_119_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VGND A1 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND A3 a_119_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_119_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_213_297# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_117_297# A2 a_213_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.cdl b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.cdl
index 3a00ba3..1dc013b 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.cdl
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o31ai_2 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o31ai_2
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.netlist.tsv b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.netlist.tsv
index 0ac594f..c106cb7 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.netlist.tsv
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.spice b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.spice
index 0b4359f..5d00d79 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.spice
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__o31ai_2 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=7e+11p pd=5.4e+06u as=8.5e+11p ps=7.7e+06u
-M1001 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.5e+11p ps=7.7e+06u
-M1002 a_27_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=1.01075e+12p pd=9.61e+06u as=1.0075e+12p ps=7e+06u
-M1003 VGND A3 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A3 a_309_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1006 a_27_297# A2 a_309_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=2.86e+11p pd=2.18e+06u as=0p ps=0u
-M1008 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_309_297# A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_309_297# A3 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_27_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND A1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_27_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VGND A3 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_27_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_27_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_309_297# A2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_309_297# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_27_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 Y A3 a_309_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_27_297# A2 a_309_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 VGND A2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VPWR A1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.cdl b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.cdl
index ab4ab6f..9df47cd 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.cdl
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o31ai_4 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o31ai_4
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.netlist.tsv b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.netlist.tsv
index 27a181b..8663845 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.netlist.tsv
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.spice b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.spice
index 834faf3..aefd69b 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.spice
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hdll__o31ai_4 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 VGND A3 a_31_47# VNB nshort w=650000u l=150000u
-+  ad=1.72575e+12p pd=1.311e+07u as=1.729e+12p ps=1.702e+07u
-M1001 a_497_297# A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=1.45e+12p ps=1.29e+07u
-M1002 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=0p ps=0u
-M1003 a_31_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_31_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1005 Y A3 a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.435e+12p pd=1.287e+07u as=0p ps=0u
-M1006 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_497_297# A3 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_31_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 a_31_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_31_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_31_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A1 a_31_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_31_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_297# A2 a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_31_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A3 a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A2 a_31_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y B1 a_31_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A3 a_31_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_497_297# A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A1 a_31_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_31_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_497_297# A3 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_31_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_27_297# A2 a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_31_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 Y B1 a_31_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_497_297# A2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_31_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 Y B1 a_31_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 Y A3 a_497_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VGND A1 a_31_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_31_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_497_297# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_31_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VGND A1 a_31_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VGND A3 a_31_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_31_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_27_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_27_297# A2 a_497_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VPWR A1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 VGND A2 a_31_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 VGND A2 a_31_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 a_31_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_497_297# A2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 a_27_297# A2 a_497_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 VGND A3 a_31_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_31_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 a_31_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 a_27_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 a_497_297# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 VPWR A1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 Y A3 a_497_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.cdl b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.cdl
index cf8f7f3..97578b3 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.cdl
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o32ai_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o32ai_1
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.netlist.tsv b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.netlist.tsv
index 4160c67..debd065 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.netlist.tsv
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.spice b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.spice
index f03ca9e..c230188 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.spice
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__o32ai_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_465_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.6e+11p pd=5.12e+06u as=2.9e+11p ps=2.58e+06u
-M1001 VGND A3 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=6.0125e+11p pd=4.45e+06u as=5.655e+11p ps=5.64e+06u
-M1002 Y B2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.15e+11p pd=3.03e+06u as=2.3e+11p ps=2.46e+06u
-M1003 a_117_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_465_297# A2 a_338_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=4.55e+11p ps=2.91e+06u
-M1005 a_27_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.4375e+11p ps=2.05e+06u
-M1006 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_338_297# A3 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 VPWR B1 a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_27_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_27_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 Y A3 a_338_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_465_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_27_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_338_297# A2 a_465_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 Y B2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_117_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.cdl b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.cdl
index 3b7786e..ce3d464 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.cdl
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o32ai_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o32ai_2
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.netlist.tsv b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.netlist.tsv
index 2d0fb0b..ea69438 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.netlist.tsv
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.spice b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.spice
index 0c2dab2..def6ac5 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.spice
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__o32ai_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 VGND A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=1.0595e+12p pd=7.16e+06u as=1.469e+12p ps=1.232e+07u
-M1001 a_27_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=8.3e+11p pd=7.66e+06u as=5.8e+11p ps=5.16e+06u
-M1002 Y A3 a_525_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.7e+11p ps=7.74e+06u
-M1003 a_27_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.81e+11p ps=4.08e+06u
-M1004 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_807_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.5e+11p pd=7.7e+06u as=5.8e+11p ps=5.16e+06u
-M1007 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_525_297# A2 a_807_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_807_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_807_297# A2 a_525_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_525_297# A3 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A3 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_27_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_27_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_27_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_525_297# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y B2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND A1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_27_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 Y B1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_807_297# A2 a_525_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 Y B2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_807_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_27_47# B2 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_27_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VPWR A1 a_807_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VGND A3 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_525_297# A2 a_807_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 a_27_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 Y A3 a_525_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.cdl b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.cdl
index 023f8b7..918ca33 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.cdl
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o32ai_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o32ai_4
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.netlist.tsv b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.netlist.tsv
index cd8b702..05c1f6f 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.netlist.tsv
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.spice b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.spice
index 2229b82..20a18f8 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.spice
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_hdll__o32ai_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_27_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.425e+12p pd=1.285e+07u as=1.41e+12p ps=1.282e+07u
-M1001 a_1352_297# A2 a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.205e+12p pd=1.041e+07u as=1.41e+12p ps=1.282e+07u
-M1002 a_27_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1003 a_1352_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=2.75925e+12p pd=2.279e+07u as=8.645e+11p ps=7.86e+06u
-M1005 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.41375e+12p ps=1.215e+07u
-M1007 VPWR B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_886_297# A2 a_1352_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1 a_1352_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A3 a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A3 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1352_297# A2 a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_886_297# A2 a_1352_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_886_297# A3 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1352_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_27_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_27_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A3 a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A1 a_1352_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A3 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_27_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_886_297# A3 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Y B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_886_297# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_886_297# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_27_47# B2 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_27_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_27_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_886_297# A2 a_1352_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_27_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_27_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR A1 a_1352_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_1352_297# A2 a_886_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_27_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 Y B2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 Y B2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 Y A3 a_886_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VGND A3 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_27_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_27_297# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 a_27_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_27_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_1352_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 Y B2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_1352_297# A2 a_886_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 a_27_47# B2 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 a_27_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_886_297# A2 a_1352_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 VGND A1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 a_1352_297# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 VGND A2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 VPWR B1 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 VPWR A1 a_1352_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 a_27_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X32 VGND A2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X33 a_27_297# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X34 Y B2 a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 Y B1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X36 Y B1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X37 VGND A1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X38 VGND A3 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X39 Y A3 a_886_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_1.cdl b/cells/or2/sky130_fd_sc_hdll__or2_1.cdl
index 03b91a1..ff00988 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_1.cdl
+++ b/cells/or2/sky130_fd_sc_hdll__or2_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__or2_1 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or2_1
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_1.netlist.tsv b/cells/or2/sky130_fd_sc_hdll__or2_1.netlist.tsv
index 89469a2..ddec484 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_1.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_hdll__or2_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	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.65	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_1.spice b/cells/or2/sky130_fd_sc_hdll__or2_1.spice
index 7e104af..bace585 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_1.spice
+++ b/cells/or2/sky130_fd_sc_hdll__or2_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hdll__or2_1 A B VGND VNB VPB VPWR X
-M1000 VPWR A a_128_297# VPB phighvt w=420000u l=180000u
-+  ad=3.057e+11p pd=2.71e+06u as=9.66e+10p ps=1.3e+06u
-M1001 a_128_297# B a_38_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1002 a_38_297# B VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=3.307e+11p ps=3.43e+06u
-M1003 X a_38_297# VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
-M1004 VGND A a_38_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_38_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.5e+11p pd=2.7e+06u as=0p ps=0u
+X0 a_38_297# B a_128_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VGND B a_38_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND a_38_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR a_38_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_128_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 a_38_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_2.cdl b/cells/or2/sky130_fd_sc_hdll__or2_2.cdl
index 4455fef..a637b7e 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_2.cdl
+++ b/cells/or2/sky130_fd_sc_hdll__or2_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__or2_2 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or2_2
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_2.netlist.tsv b/cells/or2/sky130_fd_sc_hdll__or2_2.netlist.tsv
index d5e4dc4..8cfb116 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_2.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_hdll__or2_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	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.65	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_2.spice b/cells/or2/sky130_fd_sc_hdll__or2_2.spice
index ca2653c..7b4fed9 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_2.spice
+++ b/cells/or2/sky130_fd_sc_hdll__or2_2.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__or2_2 A B VGND VNB VPB VPWR X
-M1000 VPWR A a_129_297# VPB phighvt w=420000u l=180000u
-+  ad=5.957e+11p pd=5.29e+06u as=9.66e+10p ps=1.3e+06u
-M1001 X a_39_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1002 a_129_297# B a_39_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1003 VGND A a_39_297# VNB nshort w=420000u l=150000u
-+  ad=5.337e+11p pd=5.39e+06u as=1.134e+11p ps=1.38e+06u
-M1004 VGND a_39_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.405e+11p ps=2.04e+06u
-M1005 X a_39_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_39_297# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_39_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_39_297# B a_129_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 X a_39_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_39_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND B a_39_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_39_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_129_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 X a_39_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VPWR a_39_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_4.cdl b/cells/or2/sky130_fd_sc_hdll__or2_4.cdl
index 1d9a578..0f17836 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_4.cdl
+++ b/cells/or2/sky130_fd_sc_hdll__or2_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__or2_4 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or2_4
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_4.netlist.tsv b/cells/or2/sky130_fd_sc_hdll__or2_4.netlist.tsv
index dddda0d..4972c90 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_4.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_hdll__or2_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	4	0.65	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_4.spice b/cells/or2/sky130_fd_sc_hdll__or2_4.spice
index 549f211..379c8bd 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_4.spice
+++ b/cells/or2/sky130_fd_sc_hdll__or2_4.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__or2_4 A B VGND VNB VPB VPWR X
-M1000 VGND a_35_297# X VNB nshort w=650000u l=150000u
-+  ad=8.4175e+11p pd=7.79e+06u as=4.485e+11p ps=3.98e+06u
-M1001 VPWR A a_129_297# VPB phighvt w=1e+06u l=180000u
-+  ad=9.55e+11p pd=7.91e+06u as=2.3e+11p ps=2.46e+06u
-M1002 X a_35_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1003 a_129_297# B a_35_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1004 VGND A a_35_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1005 X a_35_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_35_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_35_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_35_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_35_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_35_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_35_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_35_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_35_297# B a_129_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 X a_35_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR a_35_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 X a_35_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_35_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VGND B a_35_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND a_35_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_129_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 X a_35_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VPWR a_35_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VGND a_35_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_6.cdl b/cells/or2/sky130_fd_sc_hdll__or2_6.cdl
index 270a8a4..0babe94 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_6.cdl
+++ b/cells/or2/sky130_fd_sc_hdll__or2_6.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__or2_6 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or2_6
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_6.netlist.tsv b/cells/or2/sky130_fd_sc_hdll__or2_6.netlist.tsv
index 8068478..54436d3 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_6.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_hdll__or2_6.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__or2_6	A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	6	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	6	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_6.spice b/cells/or2/sky130_fd_sc_hdll__or2_6.spice
index 53daa3f..e16ac1c 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_6.spice
+++ b/cells/or2/sky130_fd_sc_hdll__or2_6.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__or2_6 A B VGND VNB VPB VPWR X
-M1000 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.42e+12p pd=1.284e+07u as=8.5e+11p ps=7.7e+06u
-M1001 VGND A a_123_47# VNB nshort w=650000u l=150000u
-+  ad=1.7225e+12p pd=1.31e+07u as=3.51e+11p ps=3.68e+06u
-M1002 X a_123_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=0p ps=0u
-M1003 VGND a_123_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.265e+11p ps=5.52e+06u
-M1004 a_123_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_123_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_297# B a_123_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1007 VPWR a_123_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_123_47# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_123_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_123_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_123_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_123_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B a_123_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_123_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_123_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_123_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_123_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_123_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_123_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 X a_123_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 X a_123_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VGND A a_123_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND a_123_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 X a_123_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_123_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND a_123_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 X a_123_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VPWR a_123_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_123_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_123_47# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 X a_123_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 VGND B a_123_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VGND a_123_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_27_297# B a_123_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 VPWR a_123_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 X a_123_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_8.cdl b/cells/or2/sky130_fd_sc_hdll__or2_8.cdl
index 0b36e2d..bf21272 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_8.cdl
+++ b/cells/or2/sky130_fd_sc_hdll__or2_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__or2_8 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or2_8
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_8.netlist.tsv b/cells/or2/sky130_fd_sc_hdll__or2_8.netlist.tsv
index 22d6d6c..9089690 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_8.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_hdll__or2_8.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hdll__or2_8	A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_8.spice b/cells/or2/sky130_fd_sc_hdll__or2_8.spice
index 7733fb1..f1b0ec3 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_8.spice
+++ b/cells/or2/sky130_fd_sc_hdll__or2_8.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__or2_8 A B VGND VNB VPB VPWR X
-M1000 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.71e+12p pd=1.542e+07u as=8.5e+11p ps=7.7e+06u
-M1001 VGND A a_123_47# VNB nshort w=650000u l=150000u
-+  ad=1.963e+12p pd=1.514e+07u as=3.51e+11p ps=3.68e+06u
-M1002 X a_123_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=0p ps=0u
-M1003 VGND a_123_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.02e+11p ps=7.36e+06u
-M1004 a_123_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_123_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_297# B a_123_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1007 VPWR a_123_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_123_47# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_123_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_123_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_123_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_123_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_123_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_123_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND B a_123_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_123_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_123_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_123_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_123_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_123_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_123_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_123_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_123_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 X a_123_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VPWR a_123_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VPWR a_123_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 X a_123_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 X a_123_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND A a_123_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND a_123_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 X a_123_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_123_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VGND a_123_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 X a_123_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VGND a_123_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 VPWR a_123_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_123_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_123_47# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 X a_123_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VGND B a_123_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 VGND a_123_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_27_297# B a_123_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR a_123_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 X a_123_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_1.cdl b/cells/or2b/sky130_fd_sc_hdll__or2b_1.cdl
index f3d52b3..547f41b 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_1.cdl
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__or2b_1 A B_N VGND VNB VPB VPWR X
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.18 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.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or2b_1
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_1.netlist.tsv b/cells/or2b/sky130_fd_sc_hdll__or2b_1.netlist.tsv
index 7b5f077..466289d 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_1.netlist.tsv
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	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.65	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_1.spice b/cells/or2b/sky130_fd_sc_hdll__or2b_1.spice
index 51c07d2..41a3f7e 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_1.spice
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__or2b_1 A B_N VGND VNB VPB VPWR X
-M1000 VGND B_N a_27_53# VNB nshort w=420000u l=150000u
-+  ad=5.7225e+11p pd=4.52e+06u as=1.302e+11p ps=1.46e+06u
-M1001 X a_229_297# VGND VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=0p ps=0u
-M1002 a_27_53# B_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=4.241e+11p ps=4.1e+06u
-M1003 a_319_297# a_27_53# a_229_297# VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=1.134e+11p ps=1.38e+06u
-M1004 VGND A a_229_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1005 VPWR A a_319_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_229_297# a_27_53# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_229_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
+X0 VPWR B_N a_27_53# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VGND a_27_53# a_229_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_229_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_27_53# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_319_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 a_229_297# a_27_53# a_319_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 a_229_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_229_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_2.cdl b/cells/or2b/sky130_fd_sc_hdll__or2b_2.cdl
index 6029ebd..9a44a33 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_2.cdl
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__or2b_2 A B_N VGND VNB VPB VPWR X
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.18 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.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or2b_2
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_2.netlist.tsv b/cells/or2b/sky130_fd_sc_hdll__or2b_2.netlist.tsv
index 76090ac..bcfab0d 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_2.netlist.tsv
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	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.65	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_2.spice b/cells/or2b/sky130_fd_sc_hdll__or2b_2.spice
index 4754c00..019ebde 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_2.spice
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__or2b_2 A B_N VGND VNB VPB VPWR X
-M1000 VGND B_N a_27_53# VNB nshort w=420000u l=150000u
-+  ad=7.764e+11p pd=6.48e+06u as=1.302e+11p ps=1.46e+06u
-M1001 a_228_297# a_27_53# VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1002 VPWR a_228_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=7.191e+11p pd=6.69e+06u as=4.8e+11p ps=2.96e+06u
-M1003 a_27_53# B_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1004 a_318_297# a_27_53# a_228_297# VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=1.134e+11p ps=1.38e+06u
-M1005 VPWR A a_318_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_228_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.315e+11p ps=2.32e+06u
-M1007 X a_228_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_228_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A a_228_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_228_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR B_N a_27_53# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 VGND a_228_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR a_228_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 X a_228_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_318_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 a_27_53# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 X a_228_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VGND a_27_53# a_228_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_228_297# a_27_53# a_318_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_4.cdl b/cells/or2b/sky130_fd_sc_hdll__or2b_4.cdl
index 491a7c2..e1365d0 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_4.cdl
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__or2b_4 A B_N VGND VNB VPB VPWR X
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=4 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or2b_4
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_4.netlist.tsv b/cells/or2b/sky130_fd_sc_hdll__or2b_4.netlist.tsv
index 840a97d..6e377e0 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_4.netlist.tsv
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.65	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.65	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_4.spice b/cells/or2b/sky130_fd_sc_hdll__or2b_4.spice
index d3bdd3b..2208247 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_4.spice
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_4.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_hdll__or2b_4 A B_N VGND VNB VPB VPWR X
-M1000 VGND B_N a_27_53# VNB nshort w=420000u l=150000u
-+  ad=1.11205e+12p pd=8.88e+06u as=1.302e+11p ps=1.46e+06u
-M1001 a_27_53# B_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=1.0684e+12p ps=9.29e+06u
-M1002 VPWR a_229_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1003 VGND A a_229_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1004 a_229_297# a_27_53# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_319_297# a_27_53# a_229_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.3e+11p pd=2.46e+06u as=2.7e+11p ps=2.54e+06u
-M1006 X a_229_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_319_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_229_297# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1009 VGND a_229_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_229_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_229_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_229_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_229_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_229_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR B_N a_27_53# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 a_229_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND a_229_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR a_229_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_27_53# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_27_53# a_229_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_319_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VGND a_229_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 X a_229_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_229_297# a_27_53# a_319_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 X a_229_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 X a_229_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VPWR a_229_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_1.cdl b/cells/or3/sky130_fd_sc_hdll__or3_1.cdl
index a5eb24a..576524a 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_1.cdl
+++ b/cells/or3/sky130_fd_sc_hdll__or3_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__or3_1 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.18 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.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or3_1
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_1.netlist.tsv b/cells/or3/sky130_fd_sc_hdll__or3_1.netlist.tsv
index 48711de..9f61977 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_1.netlist.tsv
+++ b/cells/or3/sky130_fd_sc_hdll__or3_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	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.65	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_1.spice b/cells/or3/sky130_fd_sc_hdll__or3_1.spice
index 7a24f3f..5666006 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_1.spice
+++ b/cells/or3/sky130_fd_sc_hdll__or3_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hdll__or3_1 A B C VGND VNB VPB VPWR X
-M1000 X a_29_53# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=4.95e+11p pd=2.99e+06u as=3.107e+11p ps=2.72e+06u
-M1001 VGND C a_29_53# VNB nshort w=420000u l=150000u
-+  ad=3.4965e+11p pd=3.46e+06u as=2.856e+11p ps=3.04e+06u
-M1002 a_119_297# C a_29_53# VPB phighvt w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.134e+11p ps=1.38e+06u
-M1003 VPWR A a_203_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.428e+11p ps=1.52e+06u
-M1004 X a_29_53# VGND VNB nshort w=650000u l=150000u
-+  ad=3.1525e+11p pd=2.27e+06u as=0p ps=0u
-M1005 VGND A a_29_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_203_297# B a_119_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_29_53# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_119_297# B a_203_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 a_29_53# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_29_53# C a_119_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 VPWR a_29_53# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND a_29_53# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_29_53# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND B a_29_53# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_203_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_2.cdl b/cells/or3/sky130_fd_sc_hdll__or3_2.cdl
index 34c37d2..becb958 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_2.cdl
+++ b/cells/or3/sky130_fd_sc_hdll__or3_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__or3_2 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.18 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.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or3_2
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_2.netlist.tsv b/cells/or3/sky130_fd_sc_hdll__or3_2.netlist.tsv
index 5d82949..f774209 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_2.netlist.tsv
+++ b/cells/or3/sky130_fd_sc_hdll__or3_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	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.65	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_2.spice b/cells/or3/sky130_fd_sc_hdll__or3_2.spice
index 710f44b..5df7c75 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_2.spice
+++ b/cells/or3/sky130_fd_sc_hdll__or3_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__or3_2 A B C VGND VNB VPB VPWR X
-M1000 VGND a_30_53# X VNB nshort w=650000u l=150000u
-+  ad=6.469e+11p pd=5.71e+06u as=2.405e+11p ps=2.04e+06u
-M1001 a_120_297# C a_30_53# VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=1.134e+11p ps=1.38e+06u
-M1002 VGND A a_30_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1003 VPWR a_30_53# X VPB phighvt w=1e+06u l=180000u
-+  ad=8.257e+11p pd=5.75e+06u as=2.9e+11p ps=2.58e+06u
-M1004 a_30_53# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_30_53# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_202_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.47e+11p ps=1.54e+06u
-M1007 X a_30_53# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND C a_30_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_202_297# B a_120_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_120_297# B a_202_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 X a_30_53# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_30_53# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND B a_30_53# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_30_53# C a_120_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 a_30_53# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_30_53# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_202_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X8 X a_30_53# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VPWR a_30_53# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_4.cdl b/cells/or3/sky130_fd_sc_hdll__or3_4.cdl
index c885458..6e0fc3e 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_4.cdl
+++ b/cells/or3/sky130_fd_sc_hdll__or3_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__or3_4 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or3_4
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_4.netlist.tsv b/cells/or3/sky130_fd_sc_hdll__or3_4.netlist.tsv
index d590ea9..2160776 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_4.netlist.tsv
+++ b/cells/or3/sky130_fd_sc_hdll__or3_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nshort	4	0.65	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_4.spice b/cells/or3/sky130_fd_sc_hdll__or3_4.spice
index df64617..b0df8f8 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_4.spice
+++ b/cells/or3/sky130_fd_sc_hdll__or3_4.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_hdll__or3_4 A B C VGND VNB VPB VPWR X
-M1000 a_211_297# B a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=2.9e+11p ps=2.58e+06u
-M1001 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=1.20575e+12p ps=8.91e+06u
-M1002 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.48e+12p pd=8.96e+06u as=5.8e+11p ps=5.16e+06u
-M1003 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_117_297# C a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1006 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1007 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND C a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A a_211_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_27_47# C a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VGND B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_211_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_27_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_117_297# B a_211_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_1.cdl b/cells/or3b/sky130_fd_sc_hdll__or3b_1.cdl
index 97812e6..1b1eff5 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_1.cdl
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__or3b_1 A B C_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.18 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.18 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.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or3b_1
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_1.netlist.tsv b/cells/or3b/sky130_fd_sc_hdll__or3b_1.netlist.tsv
index 58e07ba..de78b2c 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_1.netlist.tsv
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	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.65	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_1.spice b/cells/or3b/sky130_fd_sc_hdll__or3b_1.spice
index 74a3659..b23a199 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_1.spice
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__or3b_1 A B C_N VGND VNB VPB VPWR X
-M1000 a_225_53# B VGND VNB nshort w=420000u l=150000u
-+  ad=2.835e+11p pd=3.03e+06u as=4.787e+11p ps=4.92e+06u
-M1001 VGND A a_225_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND a_117_297# a_225_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_117_297# C_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=4.241e+11p ps=4.1e+06u
-M1004 VPWR A a_399_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.407e+11p ps=1.51e+06u
-M1005 a_399_297# B a_315_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1006 a_117_297# C_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1007 a_315_297# a_117_297# a_225_53# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1008 X a_225_53# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1009 X a_225_53# VGND VNB nshort w=650000u l=150000u
-+  ad=1.7875e+11p pd=1.85e+06u as=0p ps=0u
+X0 a_225_53# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_225_53# a_117_297# a_315_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 VPWR C_N a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 VGND B a_225_53# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_225_53# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_315_297# B a_399_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 VGND C_N a_117_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_225_53# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_225_53# a_117_297# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_399_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_2.cdl b/cells/or3b/sky130_fd_sc_hdll__or3b_2.cdl
index 270020f..2022522 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_2.cdl
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__or3b_2 A B C_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.18 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.18 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.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or3b_2
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_2.netlist.tsv b/cells/or3b/sky130_fd_sc_hdll__or3b_2.netlist.tsv
index fe1c0fb..93a7c35 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_2.netlist.tsv
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	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.65	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_2.spice b/cells/or3b/sky130_fd_sc_hdll__or3b_2.spice
index 62657ea..3e61c11 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_2.spice
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__or3b_2 A B C_N VGND VNB VPB VPWR X
-M1000 a_448_297# A VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.302e+11p pd=1.46e+06u as=6.164e+11p ps=5.43e+06u
-M1001 X a_186_21# VGND VNB nshort w=650000u l=150000u
-+  ad=3.4125e+11p pd=2.35e+06u as=5.5575e+11p ps=5.52e+06u
-M1002 VGND B a_186_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.268e+11p ps=2.76e+06u
-M1003 a_186_21# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_546_297# B a_448_297# VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1005 a_186_21# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR C_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1007 VPWR a_186_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=4e+11p ps=2.8e+06u
-M1008 a_186_21# a_27_47# a_546_297# VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1009 VGND C_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1010 X a_186_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_186_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_546_297# a_27_47# a_186_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 X a_186_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VGND A a_186_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND a_186_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND a_27_47# a_186_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_27_47# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_186_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VPWR A a_448_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X8 a_186_21# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_27_47# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X10 X a_186_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_448_297# B a_546_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_4.cdl b/cells/or3b/sky130_fd_sc_hdll__or3b_4.cdl
index eeefaf7..622372b 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_4.cdl
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__or3b_4 A B C_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB phighvt m=4 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nshort m=1 w=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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or3b_4
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_4.netlist.tsv b/cells/or3b/sky130_fd_sc_hdll__or3b_4.netlist.tsv
index 1398356..fbf7905 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_4.netlist.tsv
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.65	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.65	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_4.spice b/cells/or3b/sky130_fd_sc_hdll__or3b_4.spice
index 6d71f0e..2b29e9d 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_4.spice
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_4.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__or3b_4 A B C_N VGND VNB VPB VPWR X
-M1000 VPWR a_186_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=8.857e+11p pd=7.87e+06u as=5.8e+11p ps=5.16e+06u
-M1001 X a_186_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=8.635e+11p ps=7.91e+06u
-M1002 a_186_21# A VGND VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=0p ps=0u
-M1003 a_186_21# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_186_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_186_21# a_27_47# a_694_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=3.5e+11p ps=2.7e+06u
-M1006 VGND B a_186_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_186_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_186_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR C_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1010 VGND C_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1011 X a_186_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_186_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_186_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_694_297# B a_600_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1015 a_600_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_27_47# a_186_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 X a_186_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 X a_186_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VPWR a_186_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_694_297# a_27_47# a_186_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_186_21# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VGND a_186_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_600_297# B a_694_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VGND A a_186_21# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_27_47# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND a_186_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 X a_186_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VPWR a_186_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_27_47# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X14 VPWR A a_600_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 X a_186_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_1.cdl b/cells/or4/sky130_fd_sc_hdll__or4_1.cdl
index c931e8e..ff13dae 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_1.cdl
+++ b/cells/or4/sky130_fd_sc_hdll__or4_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__or4_1 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.18 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.18 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.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or4_1
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_1.netlist.tsv b/cells/or4/sky130_fd_sc_hdll__or4_1.netlist.tsv
index db4903c..e0a5816 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_1.netlist.tsv
+++ b/cells/or4/sky130_fd_sc_hdll__or4_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	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.65	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_1.spice b/cells/or4/sky130_fd_sc_hdll__or4_1.spice
index cd5dec1..99b6308 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_1.spice
+++ b/cells/or4/sky130_fd_sc_hdll__or4_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__or4_1 A B C D VGND VNB VPB VPWR X
-M1000 a_27_297# D VGND VNB nshort w=420000u l=150000u
-+  ad=3.15e+11p pd=3.18e+06u as=4.7985e+11p ps=4.92e+06u
-M1001 X a_27_297# VGND VNB nshort w=650000u l=150000u
-+  ad=2.73e+11p pd=2.14e+06u as=0p ps=0u
-M1002 VGND A a_27_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_117_297# D a_27_297# VPB phighvt w=420000u l=180000u
-+  ad=1.47e+11p pd=1.54e+06u as=1.134e+11p ps=1.38e+06u
-M1004 VPWR A a_307_297# VPB phighvt w=420000u l=180000u
-+  ad=3.107e+11p pd=2.72e+06u as=1.428e+11p ps=1.52e+06u
-M1005 VGND C a_27_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_307_297# B a_223_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 a_27_297# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_27_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=4.3e+11p pd=2.86e+06u as=0p ps=0u
-M1009 a_223_297# C a_117_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_27_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_27_297# D a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 a_307_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 VGND B a_27_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND D a_27_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_27_297# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_27_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_117_297# C a_223_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X8 VGND a_27_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_223_297# B a_307_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_2.cdl b/cells/or4/sky130_fd_sc_hdll__or4_2.cdl
index 3d2ad07..e1751f7 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_2.cdl
+++ b/cells/or4/sky130_fd_sc_hdll__or4_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__or4_2 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.18 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.18 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.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or4_2
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_2.netlist.tsv b/cells/or4/sky130_fd_sc_hdll__or4_2.netlist.tsv
index 15e53ff..c9eaac8 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_2.netlist.tsv
+++ b/cells/or4/sky130_fd_sc_hdll__or4_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	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.65	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_2.spice b/cells/or4/sky130_fd_sc_hdll__or4_2.spice
index a5a31d6..a2149bd 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_2.spice
+++ b/cells/or4/sky130_fd_sc_hdll__or4_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__or4_2 A B C D VGND VNB VPB VPWR X
-M1000 a_27_297# D VGND VNB nshort w=420000u l=150000u
-+  ad=2.94e+11p pd=3.08e+06u as=6.666e+11p ps=6.83e+06u
-M1001 VGND A a_27_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 X a_27_297# VGND VNB nshort w=650000u l=150000u
-+  ad=3.4775e+11p pd=2.37e+06u as=0p ps=0u
-M1003 a_117_297# D a_27_297# VPB phighvt w=420000u l=180000u
-+  ad=1.47e+11p pd=1.54e+06u as=1.134e+11p ps=1.38e+06u
-M1004 VPWR A a_305_297# VPB phighvt w=420000u l=180000u
-+  ad=6.257e+11p pd=5.35e+06u as=1.47e+11p ps=1.54e+06u
-M1005 a_27_297# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C a_27_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_27_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=4.55e+11p ps=2.91e+06u
-M1008 VGND a_27_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_27_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_223_297# C a_117_297# VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=0p ps=0u
-M1011 a_305_297# B a_223_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_27_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND B a_27_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_27_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_27_297# D a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 a_305_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 VGND D a_27_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_27_297# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_223_297# B a_305_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X8 a_27_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 X a_27_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_117_297# C a_223_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X11 VGND a_27_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_4.cdl b/cells/or4/sky130_fd_sc_hdll__or4_4.cdl
index ce764ae..50e5da5 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_4.cdl
+++ b/cells/or4/sky130_fd_sc_hdll__or4_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__or4_4 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or4_4
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_4.netlist.tsv b/cells/or4/sky130_fd_sc_hdll__or4_4.netlist.tsv
index 7912349..c599ae0 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_4.netlist.tsv
+++ b/cells/or4/sky130_fd_sc_hdll__or4_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	4	0.65	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_4.spice b/cells/or4/sky130_fd_sc_hdll__or4_4.spice
index a410f1e..eeaa32f 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_4.spice
+++ b/cells/or4/sky130_fd_sc_hdll__or4_4.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__or4_4 A B C D VGND VNB VPB VPWR X
-M1000 X a_32_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=9.7e+11p ps=7.94e+06u
-M1001 a_332_297# B a_238_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=2.9e+11p ps=2.58e+06u
-M1002 X a_32_297# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=1.07575e+12p ps=9.81e+06u
-M1003 VGND A a_32_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.55e+11p ps=4e+06u
-M1004 VGND a_32_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_32_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C a_32_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_32_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_238_297# C a_122_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=4e+11p ps=2.8e+06u
-M1009 VPWR a_32_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A a_332_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_32_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_32_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_32_297# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_122_297# D a_32_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1015 VPWR a_32_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_32_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_32_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_32_297# C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VGND a_32_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 X a_32_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 X a_32_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR a_32_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 X a_32_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VPWR a_32_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_122_297# C a_238_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_32_297# D a_122_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_332_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_238_297# B a_332_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VGND a_32_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VGND D a_32_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VGND B a_32_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_1.cdl b/cells/or4b/sky130_fd_sc_hdll__or4b_1.cdl
index 7109be9..0fd944f 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_1.cdl
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__or4b_1 A B C D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.18 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.18 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.18 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.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or4b_1
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_1.netlist.tsv b/cells/or4b/sky130_fd_sc_hdll__or4b_1.netlist.tsv
index 1776982..4ee1542 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_1.netlist.tsv
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	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.65	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_1.spice b/cells/or4b/sky130_fd_sc_hdll__or4b_1.spice
index 812f92b..aad5c90 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_1.spice
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hdll__or4b_1 A B C D_N VGND VNB VPB VPWR X
-M1000 a_117_297# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=6.1845e+11p ps=6.42e+06u
-M1001 a_225_297# a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=2.961e+11p pd=3.09e+06u as=0p ps=0u
-M1002 X a_225_297# VGND VNB nshort w=650000u l=150000u
-+  ad=1.7875e+11p pd=1.85e+06u as=0p ps=0u
-M1003 VGND A a_225_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_117_297# D_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=4.241e+11p ps=4.1e+06u
-M1005 a_504_297# B a_416_297# VPB phighvt w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=1.092e+11p ps=1.36e+06u
-M1006 a_225_297# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_504_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND C a_225_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_315_297# a_117_297# a_225_297# VPB phighvt w=420000u l=180000u
-+  ad=1.365e+11p pd=1.49e+06u as=1.134e+11p ps=1.38e+06u
-M1010 a_416_297# C a_315_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_225_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
+X0 a_225_297# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_504_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 a_225_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_225_297# a_117_297# a_315_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 VPWR D_N a_117_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 VGND D_N a_117_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_225_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND B a_225_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND a_117_297# a_225_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_315_297# C a_416_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X10 a_416_297# B a_504_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X11 VPWR a_225_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_2.cdl b/cells/or4b/sky130_fd_sc_hdll__or4b_2.cdl
index 24b6d3c..7e978cc 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_2.cdl
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__or4b_2 A B C D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.18 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.18 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.18 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.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or4b_2
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_2.netlist.tsv b/cells/or4b/sky130_fd_sc_hdll__or4b_2.netlist.tsv
index a4a64ef..a93a852 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_2.netlist.tsv
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	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.65	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_2.spice b/cells/or4b/sky130_fd_sc_hdll__or4b_2.spice
index f830c8c..7a311db 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_2.spice
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_hdll__or4b_2 A B C D_N VGND VNB VPB VPWR X
-M1000 a_425_297# A VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.47e+11p pd=1.54e+06u as=7.227e+11p ps=6.17e+06u
-M1001 X a_186_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.08e+11p pd=1.94e+06u as=6.771e+11p ps=6.88e+06u
-M1002 VGND a_27_47# a_186_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.15e+11p ps=3.18e+06u
-M1003 a_186_21# a_27_47# a_615_297# VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=1.428e+11p ps=1.52e+06u
-M1004 VPWR D_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1005 VPWR a_186_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1006 a_615_297# C a_531_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 VGND B a_186_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_531_297# B a_425_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_186_21# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND D_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1011 a_186_21# C VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_186_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_186_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND C a_186_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_186_21# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A a_425_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 a_27_47# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 a_186_21# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_186_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VGND A a_186_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_615_297# a_27_47# a_186_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X8 a_27_47# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 X a_186_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VPWR a_186_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_531_297# C a_615_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X12 X a_186_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_425_297# B a_531_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_4.cdl b/cells/or4b/sky130_fd_sc_hdll__or4b_4.cdl
index 61f1806..e1c5fe9 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_4.cdl
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__or4b_4 A B C D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=4 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or4b_4
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_4.netlist.tsv b/cells/or4b/sky130_fd_sc_hdll__or4b_4.netlist.tsv
index d7e8c7d..bf85192 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_4.netlist.tsv
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.65	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.65	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_4.spice b/cells/or4b/sky130_fd_sc_hdll__or4b_4.spice
index 989393c..86ff090 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_4.spice
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_hdll__or4b_4 A B C D_N VGND VNB VPB VPWR X
-M1000 VPWR a_225_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.0734e+12p pd=9.3e+06u as=5.8e+11p ps=5.16e+06u
-M1001 VPWR A a_525_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1002 X a_225_297# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=1.2023e+12p ps=1.127e+07u
-M1003 a_117_413# D_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1004 X a_225_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A a_225_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.55e+11p ps=4e+06u
-M1006 a_525_297# B a_431_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1007 a_225_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_431_297# C a_315_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=4e+11p ps=2.8e+06u
-M1009 VPWR a_225_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_225_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_225_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND C a_225_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_117_413# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.0785e+11p pd=1.36e+06u as=0p ps=0u
-M1014 a_225_297# a_117_413# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_225_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_225_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_315_297# a_117_413# a_225_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
+X0 VPWR D_N a_117_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 X a_225_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_225_297# a_117_413# a_315_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VPWR a_225_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND a_225_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_525_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND D_N a_117_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_431_297# B a_525_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VGND a_225_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 X a_225_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VPWR a_225_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_225_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_315_297# C a_431_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 X a_225_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 VGND a_117_413# a_225_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_225_297# C VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 X a_225_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VGND B a_225_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.cdl b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.cdl
index 45d9763..5fd9c35 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.cdl
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_hdll__or4bb_1 A B C_N D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.18 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.18 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.18 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.18 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.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or4bb_1
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.netlist.tsv b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.netlist.tsv
index 10e3ac8..7a15c7c 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.netlist.tsv
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	1	1.0	0.18	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.65	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.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.spice b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.spice
index 7afdca1..d5ba8ec 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.spice
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_hdll__or4bb_1 A B C_N D_N VGND VNB VPB VPWR X
-M1000 X a_331_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.64325e+11p ps=5.4e+06u
-M1001 a_609_297# B a_527_297# VPB phighvt w=420000u l=180000u
-+  ad=1.281e+11p pd=1.45e+06u as=9.66e+10p ps=1.3e+06u
-M1002 a_421_413# a_216_93# a_331_413# VPB phighvt w=420000u l=180000u
-+  ad=2.514e+11p pd=2.7e+06u as=1.134e+11p ps=1.38e+06u
-M1003 a_216_93# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.281e+11p pd=1.45e+06u as=6.2055e+11p ps=6.43e+06u
-M1004 a_331_413# B VGND VNB nshort w=420000u l=150000u
-+  ad=2.814e+11p pd=3.02e+06u as=0p ps=0u
-M1005 VGND A a_331_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C_N a_27_410# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1007 VGND a_27_410# a_331_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A a_609_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_331_413# VGND VNB nshort w=650000u l=150000u
-+  ad=1.7875e+11p pd=1.85e+06u as=0p ps=0u
-M1010 a_331_413# a_216_93# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR C_N a_27_410# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1012 a_216_93# D_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1013 a_527_297# a_27_410# a_421_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_331_413# a_27_410# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_27_410# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND D_N a_216_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR a_331_413# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_331_413# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_331_413# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VGND a_216_93# a_331_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_527_297# B a_609_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X8 a_27_410# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X9 VGND B a_331_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR D_N a_216_93# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X11 a_609_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X12 a_331_413# a_216_93# a_421_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X13 a_421_413# a_27_410# a_527_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.cdl b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.cdl
index ae061f2..7317a7d 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.cdl
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_hdll__or4bb_2 A B C_N D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.18 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.18 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.18 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.18 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.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or4bb_2
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.netlist.tsv b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.netlist.tsv
index 28c90c0..218f599 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.netlist.tsv
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	2	1.0	0.18	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.65	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.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.spice b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.spice
index 0188f1c..a5fbf07 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.spice
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hdll__or4bb_2 A B C_N D_N VGND VNB VPB VPWR X
-M1000 VPWR A a_614_297# VPB phighvt w=420000u l=180000u
-+  ad=8.59325e+11p pd=7.99e+06u as=1.281e+11p ps=1.45e+06u
-M1001 VGND C_N a_27_410# VNB nshort w=420000u l=150000u
-+  ad=8.121e+11p pd=8.33e+06u as=1.302e+11p ps=1.46e+06u
-M1002 a_336_413# a_216_93# VGND VNB nshort w=420000u l=150000u
-+  ad=2.814e+11p pd=3.02e+06u as=0p ps=0u
-M1003 a_216_93# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1004 VPWR a_336_413# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1005 X a_336_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_532_297# a_27_410# a_426_413# VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=2.514e+11p ps=2.7e+06u
-M1007 VGND A a_336_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_426_413# a_216_93# a_336_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1009 a_614_297# B a_532_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR C_N a_27_410# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1011 a_216_93# D_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1012 a_336_413# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_336_413# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1014 X a_336_413# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_27_410# a_336_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_216_93# a_336_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_426_413# a_27_410# a_532_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 VGND B a_336_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND D_N a_216_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_336_413# a_216_93# a_426_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 X a_336_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 X a_336_413# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_336_413# a_27_410# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_27_410# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X9 VPWR D_N a_216_93# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X10 a_336_413# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_27_410# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR a_336_413# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VGND a_336_413# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_532_297# B a_614_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X15 a_614_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.cdl b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.cdl
index 058fa71..9690dd8 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.cdl
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_hdll__or4bb_4 A B C_N D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.42 l=0.18 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.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nshort m=1 w=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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or4bb_4
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.netlist.tsv b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.netlist.tsv
index 4be1024..99fd536 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.netlist.tsv
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.65	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.65	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.spice b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.spice
index cac7d2e..240abcb 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.spice
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__or4bb_4 A B C_N D_N VGND VNB VPB VPWR X
-M1000 X a_335_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.20363e+12p ps=1.058e+07u
-M1001 a_425_297# a_224_297# a_335_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.5e+11p pd=2.7e+06u as=2.7e+11p ps=2.54e+06u
-M1002 VGND A a_335_297# VNB nshort w=650000u l=150000u
-+  ad=1.2044e+12p pd=1.129e+07u as=4.355e+11p ps=3.94e+06u
-M1003 VPWR A a_625_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1004 a_224_297# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1005 a_335_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_335_297# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1007 VPWR a_335_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND C_N a_27_410# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1009 a_625_297# B a_531_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1010 a_531_297# a_27_410# a_425_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_335_297# a_224_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_27_410# a_335_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_335_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR C_N a_27_410# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1015 X a_335_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_335_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_224_297# D_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1018 VPWR a_335_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_335_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_410# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_335_297# a_224_297# a_425_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_335_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 X a_335_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VGND D_N a_224_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR a_335_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND a_224_297# a_335_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_335_297# a_27_410# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_625_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_27_410# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X10 VGND a_335_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_531_297# B a_625_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 VPWR D_N a_224_297# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X13 VGND B a_335_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 X a_335_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 X a_335_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VGND a_335_297# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VPWR a_335_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 X a_335_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_425_297# a_27_410# a_531_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.cdl b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.cdl
index ef2d880..efe0147 100644
--- a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.cdl
+++ b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.cdl
@@ -16,13 +16,13 @@
 
 .SUBCKT sky130_fd_sc_hdll__probe_p_8 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 Ab A VPB phighvt m=3 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Ab A VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 net29 Ab VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 net29 Ab VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Ab A VNB nshort m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 net29 Ab VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 net29 Ab VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 rI112 net29 X short
 .ENDS sky130_fd_sc_hdll__probe_p_8
diff --git a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.netlist.tsv b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.netlist.tsv
index 24c930f..9c74a9c 100644
--- a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.netlist.tsv
+++ b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.netlist.tsv
@@ -1,7 +1,7 @@
 sky130_fd_sc_hdll__probe_p_8	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula				nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET				Ab	A	VPWR	VPB	phighvt	3	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET				net29	Ab	VPWR	VPB	phighvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET				Ab	A	VGND	VNB	nshort	3	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET				net29	Ab	VGND	VNB	nshort	8	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET				net29	Ab	VPWR	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET				Ab	A	VGND	VNB	nfet_01v8	3	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET				net29	Ab	VGND	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
 rI112	RESISTOR	net29	X	short															
diff --git a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.spice b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.spice
index 965db05..d4c2e1b 100644
--- a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.spice
+++ b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.spice
@@ -16,49 +16,27 @@
 
 
 .subckt sky130_fd_sc_hdll__probe_p_8 A VGND VNB VPB VPWR X
-M1000 a_399_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=1.72e+12p ps=1.544e+07u
-M1001 a_27_47# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1002 a_27_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=1.339e+12p ps=1.192e+07u
-M1003 VPWR a_27_47# a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_27_47# a_399_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.02e+11p ps=7.36e+06u
-M1005 VPWR a_27_47# a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_399_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_399_297# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_27_47# a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_27_47# a_399_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_399_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_399_297# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_399_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_399_297# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-R0 a_399_297# X short w=3.02e+06u l=5000u
-M1017 VPWR a_27_47# a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_27_47# a_399_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_399_297# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_27_47# a_399_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_399_297# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND a_27_47# a_399_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_399_297# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VPWR a_27_47# a_399_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_399_297# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VPWR a_27_47# a_399_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VGND A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 a_399_297# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_399_297# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 VGND a_27_47# a_399_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_399_297# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_399_297# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_399_297# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_399_297# X VPB short w=3.02e+06u l=5000u
+X18 VPWR A a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 VPWR a_27_47# a_399_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VGND a_27_47# a_399_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 VPWR a_27_47# a_399_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 VGND a_27_47# a_399_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.cdl b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.cdl
index 7ee055c..0996d00 100644
--- a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.cdl
+++ b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.cdl
@@ -16,14 +16,14 @@
 
 .SUBCKT sky130_fd_sc_hdll__probec_p_8 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 Ab A VPB phighvt m=3 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Ab A VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 net33 Ab VPB phighvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 net33 Ab VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Ab A VNB nshort m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 net33 Ab VNB nshort m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 net33 Ab VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 rI112 net33 X short
 rI120 VGND met5vgnd short
 rI119 VPWR met5vpwr short
diff --git a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.netlist.tsv b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.netlist.tsv
index 40542ad..e36943b 100644
--- a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.netlist.tsv
+++ b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.netlist.tsv
@@ -1,9 +1,9 @@
 sky130_fd_sc_hdll__probec_p_8	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula				nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET				Ab	A	VPWR	VPB	phighvt	3	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET				net33	Ab	VPWR	VPB	phighvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET				Ab	A	VGND	VNB	nshort	3	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET				net33	Ab	VGND	VNB	nshort	8	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET				net33	Ab	VPWR	VPB	pfet_01v8_hvt	8	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET				Ab	A	VGND	VNB	nfet_01v8	3	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET				net33	Ab	VGND	VNB	nfet_01v8	8	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
 rI112	RESISTOR	net33	X	short															
 rI120	RESISTOR	VGND	met5vgnd	short															
 rI119	RESISTOR	VPWR	met5vpwr	short															
diff --git a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.spice b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.spice
index 8caf558..93354d6 100644
--- a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.spice
+++ b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.spice
@@ -16,51 +16,29 @@
 
 
 .subckt sky130_fd_sc_hdll__probec_p_8 A VGND VNB VPB VPWR X
-M1000 a_399_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=1.72e+12p ps=1.544e+07u
-M1001 a_27_47# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1002 a_27_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=1.339e+12p ps=1.192e+07u
-M1003 VPWR a_27_47# a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-R0 X a_399_297# short w=1.6e+06u l=100000u
-M1004 VGND a_27_47# a_399_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.02e+11p ps=7.36e+06u
-M1005 VPWR a_27_47# a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_399_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_399_297# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_27_47# a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_27_47# a_399_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_399_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_399_297# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_399_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_399_297# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-R1 VPWR m5_872_595# short w=0u l=1.2e+06u
-R2 VGND m5_872_n71# short w=0u l=1.2e+06u
-M1017 VPWR a_27_47# a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_27_47# a_399_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_399_297# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_27_47# a_399_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_399_297# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VGND a_27_47# a_399_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 X a_399_297# VPB short w=1.6e+06u l=100000u
+X3 a_399_297# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VPWR a_27_47# a_399_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_399_297# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VPWR a_27_47# a_399_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 VGND A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_399_297# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_399_297# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VGND a_27_47# a_399_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_399_297# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_399_297# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_399_297# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 VPWR m5_872_595# VNB short w=0u l=1.2e+06u
+X19 VGND m5_872_n71# VNB short w=0u l=1.2e+06u
+X20 VPWR A a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR a_27_47# a_399_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 VGND a_27_47# a_399_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VPWR a_27_47# a_399_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 VGND a_27_47# a_399_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.cdl b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.cdl
index 1f152e5..2f74063 100644
--- a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.cdl
+++ b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.cdl
@@ -17,100 +17,100 @@
 .SUBCKT sky130_fd_sc_hdll__sdfbbp_1 CLK D RESET_B SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I
 *.PININFO VPWR:I Q:O Q_N:O
-MI98 net105 D VNB 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.42 l=0.15 mult=1 sa=0.265
+MI675 net176 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net213 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI677 M1 RESET VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net145 net117 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 Q net213 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N net117 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net213 net117 VNB 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.36 l=0.15 mult=1 sa=0.265
+MI648 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI668 S0 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI667 net128 M1 VNB nshort m=1 w=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.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
-MI107 p0 SCE 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
-MI94 net105 D 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
-MI101 net105 sceb VPB phighvt m=1 w=0.64 l=0.18 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.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI679 M1 SET_B VPB 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
-MI669 S0 clkneg 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
-MI660 Q net213 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
-MI9 net117 S0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI670 net265 M1 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI678 net216 RESET VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI655 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net257 net117 VPB phighvt m=1 w=0.42 l=0.18 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.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net117 SET_B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI651 Q_N net117 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 net268 RESET VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+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
-MI650 net241 M1 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
-MI43 net105 clkpos VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI42 net105 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M0 clkneg 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
-MI643 RESET RESET_B VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI668 S0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+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
-MI45 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI680 M1 M0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net213 net117 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+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
-MI661 Q_N net117 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+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
-MI640 sceb SCE 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
+MI7 net116 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 net105 D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 net105 sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI679 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net213 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net117 S0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 net265 M1 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI678 net216 RESET VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net257 net117 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net117 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 net268 RESET VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 net241 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net105 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 RESET RESET_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI680 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net213 net117 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N net117 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfbbp_1
diff --git a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.netlist.tsv b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.netlist.tsv
index 47e8862..72acea0 100644
--- a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.netlist.tsv
+++ b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.netlist.tsv
@@ -1,50 +1,50 @@
 sky130_fd_sc_hdll__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net213	VGND	VNB	nshort	1	0.65	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.36	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.36	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.65	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.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI668	MOSFET	S0	clkpos	net128	VNB	nshort	1	0.36	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.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
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	net105	D	p0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	net105	sceb	p1	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkneg	net265	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net213	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net117	S0	net268	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net265	M1	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net216	RESET	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net257	net117	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net257	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net117	SET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net268	RESET	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	net241	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net105	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M0	clkneg	net241	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	RESET	RESET_B	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	M1	M0	net216	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net213	net117	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net117	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.42	0.18	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net213	VGND	VNB	nfet_01v8	1	0.65	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.36	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.36	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.65	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.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI668	MOSFET	S0	clkpos	net128	VNB	nfet_01v8	1	0.36	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.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
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	net105	D	p0	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkneg	net265	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net213	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net117	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net117	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.spice b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.spice
index 079ecc6..cbdcfe8 100644
--- a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.spice
+++ b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.spice
@@ -17,100 +17,52 @@
 
 .subckt sky130_fd_sc_hdll__sdfbbp_1 CLK D RESET_B SCD SCE SET_B VGND VNB VPB VPWR
 + Q Q_N
-M1000 a_2216_47# SET_B VGND VNB nshort w=420000u l=150000u
-+  ad=3.931e+11p pd=3.84e+06u as=1.5247e+12p ps=1.429e+07u
-M1001 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1002 a_2058_21# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=2.583e+11p pd=2.38e+06u as=2.152e+12p ps=1.881e+07u
-M1003 VGND SCE a_453_315# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.365e+11p ps=1.49e+06u
-M1004 a_810_413# SCE VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1005 Q_N a_2058_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.3075e+11p pd=2.01e+06u as=0p ps=0u
-M1006 a_1105_413# a_27_47# a_1003_47# VPB phighvt w=420000u l=180000u
-+  ad=1.974e+11p pd=1.78e+06u as=1.218e+11p ps=1.42e+06u
-M1007 a_2216_47# a_1525_21# a_2058_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.016e+11p ps=1.91e+06u
-M1008 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1009 a_1353_47# SET_B VGND VNB nshort w=420000u l=150000u
-+  ad=4.387e+11p pd=4.01e+06u as=0p ps=0u
-M1010 a_1864_47# a_211_363# a_1769_47# VNB nshort w=360000u l=150000u
-+  ad=1.764e+11p pd=1.7e+06u as=1.87e+11p ps=1.93e+06u
-M1011 VPWR SCE a_453_315# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.449e+11p ps=1.53e+06u
-M1012 a_1197_21# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=3.066e+11p pd=2.5e+06u as=0p ps=0u
-M1013 a_1197_21# a_1003_47# a_1353_47# VNB nshort w=640000u l=150000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1014 VGND a_2058_21# a_1992_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.341e+11p ps=1.5e+06u
-M1015 VPWR a_1197_21# a_1105_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Q a_2845_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1017 VPWR RESET_B a_1525_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1018 a_409_363# SCD VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.472e+11p pd=1.74e+06u as=0p ps=0u
-M1019 a_1121_47# a_211_363# a_1003_47# VNB nshort w=360000u l=150000u
-+  ad=1.521e+11p pd=1.6e+06u as=1.584e+11p ps=1.6e+06u
-M1020 a_1003_47# a_211_363# a_483_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=3.219e+11p ps=3.37e+06u
-M1021 a_1353_47# a_1525_21# a_1197_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_483_47# a_453_315# a_409_363# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_411_47# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1024 a_483_47# SCE a_411_47# VNB nshort w=420000u l=150000u
-+  ad=2.805e+11p pd=3.04e+06u as=0p ps=0u
-M1025 VGND a_1197_21# a_1121_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_1525_21# a_1469_329# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=2.436e+11p ps=2.26e+06u
-M1027 a_1003_47# a_27_47# a_483_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND RESET_B a_1525_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1029 VPWR a_2058_21# a_1968_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.932e+11p ps=1.76e+06u
-M1030 VPWR a_2058_21# a_2845_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1031 a_1469_329# a_1003_47# a_1197_21# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1968_413# a_211_363# a_1864_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1033 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1034 a_2320_329# a_1864_47# a_2058_21# VPB phighvt w=840000u l=180000u
-+  ad=1.932e+11p pd=2.14e+06u as=0p ps=0u
-M1035 a_483_47# D a_824_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1036 VPWR a_1525_21# a_2320_329# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1769_47# a_1197_21# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1039 Q_N a_2058_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.65e+11p pd=2.73e+06u as=0p ps=0u
-M1040 a_2058_21# a_1864_47# a_2216_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_1710_329# a_1197_21# VPWR VPB phighvt w=840000u l=180000u
-+  ad=4.032e+11p pd=2.96e+06u as=0p ps=0u
-M1042 a_1864_47# a_27_47# a_1710_329# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND a_2058_21# a_2845_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1044 a_483_47# D a_810_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_824_47# a_453_315# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_1992_47# a_27_47# a_1864_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 Q a_2845_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
+X0 a_1469_329# a_1525_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X1 a_1353_47# a_1003_47# a_1197_21# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_1769_47# a_211_363# a_1864_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X3 VGND a_2845_47# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_1525_21# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X5 VPWR SCD a_409_363# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X6 a_1864_47# a_211_363# a_1968_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 VGND SET_B a_1353_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X9 a_1710_329# a_27_47# a_1864_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X10 a_453_315# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X11 a_453_315# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_1105_413# a_1197_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X13 a_1121_47# a_1197_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_1992_47# a_2058_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VPWR a_2845_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VGND SCD a_411_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_483_47# a_211_363# a_1003_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X18 VPWR SET_B a_1197_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X19 VGND a_27_47# a_211_363# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_824_47# D a_483_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_1197_21# a_1003_47# a_1469_329# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X22 a_1968_413# a_2058_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X23 a_1003_47# a_211_363# a_1121_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X24 a_2845_47# a_2058_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X25 a_810_413# D a_483_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X26 a_1525_21# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_2845_47# a_2058_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VPWR a_2058_21# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 a_2058_21# a_1525_21# a_2216_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X31 a_2216_47# a_1864_47# a_2058_21# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X32 VPWR a_27_47# a_211_363# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X33 a_2320_329# a_1525_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X34 a_1864_47# a_27_47# a_1992_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X35 a_1003_47# a_27_47# a_1105_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X36 VPWR SET_B a_2058_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X37 a_409_363# a_453_315# a_483_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X38 VPWR SCE a_810_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X39 VGND a_1197_21# a_1769_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X40 VGND a_453_315# a_824_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X41 a_1197_21# a_1525_21# a_1353_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X42 a_411_47# SCE a_483_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X43 a_483_47# a_27_47# a_1003_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X44 a_2058_21# a_1864_47# a_2320_329# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X45 VGND a_2058_21# Q_N VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X46 VPWR a_1197_21# a_1710_329# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X47 VGND SET_B a_2216_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.cdl b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.cdl
index f356e53..026834c 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.cdl
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_hdll__sdfrbp_1 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O Q_N:O
-MI642 clkneg CLK VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net92 S0 VNB nshort m=1 w=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=1 w=0.65 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
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net115 M1 VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 Q net92 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net110 net92 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net92 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI672 net171 net92 VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=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
-MI670 Q_N net171 VNB nshort m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
+MI33 net127 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nshort m=1 w=0.42 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.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 Q net92 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net110 net92 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI672 net171 net92 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 Q_N net171 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos 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
-MI662 net215 net92 VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net92 RESET_B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos 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
-MI658 net92 S0 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
-MI30 net194 M1 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
-MI31 M0 clkneg 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
-MI32 net194 RESET_B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI662 net215 net92 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 Q net92 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
-MI648 M1 M0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg 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
-MI633 sceb SCE VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI673 net171 net92 VPB phighvt m=1 w=0.79 l=0.18 mult=1 sa=0.265
+MI659 net92 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI671 Q_N net171 VPB phighvt m=1 w=0.79 l=0.18 mult=1 sa=0.265
+MI658 net92 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
+MI30 net194 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net194 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 Q net92 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI673 net171 net92 VPB pfet_01v8_hvt m=1 w=0.79 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI671 Q_N net171 VPB pfet_01v8_hvt m=1 w=0.79 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfrbp_1
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.netlist.tsv b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.netlist.tsv
index 682ea0b..9ada25d 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.netlist.tsv
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_hdll__sdfrbp_1	CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI642	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net92	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.36	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.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	Q	net92	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net110	net92	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI672	MOSFET	net171	net92	VGND	VNB	nshort	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	Q_N	net171	VGND	VNB	nshort	1	0.52	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.18	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.5	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	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net215	net92	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net92	RESET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net215	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net92	S0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net194	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net194	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net194	RESET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	Q	net92	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI673	MOSFET	net171	net92	VPWR	VPB	phighvt	1	0.79	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI671	MOSFET	Q_N	net171	VPWR	VPB	phighvt	1	0.79	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net92	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.36	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.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	Q	net92	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net110	net92	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI672	MOSFET	net171	net92	VGND	VNB	nfet_01v8	1	0.52	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	Q_N	net171	VGND	VNB	nfet_01v8	1	0.52	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.18	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.5	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	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net215	net92	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net194	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	Q	net92	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI673	MOSFET	net171	net92	VPWR	VPB	pfet_01v8_hvt	1	0.79	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI671	MOSFET	Q_N	net171	VPWR	VPB	pfet_01v8_hvt	1	0.79	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.spice b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.spice
index 53b8275..f7844fe 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.spice
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_hdll__sdfrbp_1 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 a_1428_47# a_1380_303# a_1322_47# VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.518e+11p ps=1.6e+06u
-M1001 a_213_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=1.5405e+12p ps=1.444e+07u
-M1002 VPWR a_1972_21# a_1951_413# VPB phighvt w=420000u l=180000u
-+  ad=1.88075e+12p pd=1.788e+07u as=1.386e+11p ps=1.5e+06u
-M1003 a_1972_21# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1004 Q a_1972_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.15e+11p pd=2.63e+06u as=0p ps=0u
-M1005 a_2157_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=0p ps=0u
-M1006 VPWR SCD a_870_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=1.971e+11p ps=1.81e+06u
-M1007 a_700_389# D a_631_119# VNB nshort w=420000u l=150000u
-+  ad=3.3215e+11p pd=3.47e+06u as=1.302e+11p ps=1.46e+06u
-M1008 a_1380_303# a_1202_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.541e+11p pd=2.37e+06u as=0p ps=0u
-M1009 a_1202_413# a_27_47# a_700_389# VNB nshort w=360000u l=150000u
-+  ad=1.44e+11p pd=1.52e+06u as=0p ps=0u
-M1010 VPWR a_1757_47# a_1972_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1972_21# a_1757_47# a_2157_47# VNB nshort w=420000u l=150000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1012 Q a_1972_21# VGND VNB nshort w=650000u l=150000u
-+  ad=1.9825e+11p pd=1.91e+06u as=0p ps=0u
-M1013 VPWR a_1380_303# a_1324_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1014 VPWR a_1972_21# a_2580_47# VPB phighvt w=790000u l=180000u
-+  ad=0p pd=0u as=2.133e+11p ps=2.12e+06u
-M1015 VPWR CLK a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1016 a_618_389# SCE VPWR VPB phighvt w=540000u l=180000u
-+  ad=1.242e+11p pd=1.54e+06u as=0p ps=0u
-M1017 a_1951_413# a_213_47# a_1757_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1018 VGND a_1972_21# a_2580_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1019 a_700_389# D a_618_389# VPB phighvt w=540000u l=180000u
-+  ad=5.193e+11p pd=4.01e+06u as=0p ps=0u
-M1020 a_631_119# a_331_66# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND RESET_B a_1428_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1324_413# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1202_413# a_213_47# a_700_389# VPB phighvt w=420000u l=180000u
-+  ad=1.806e+11p pd=1.7e+06u as=0p ps=0u
-M1024 a_1324_413# a_27_47# a_1202_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1866_47# a_27_47# a_1757_47# VNB nshort w=360000u l=150000u
-+  ad=2.121e+11p pd=1.9e+06u as=1.422e+11p ps=1.51e+06u
-M1026 a_1757_47# a_213_47# a_1380_303# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.87e+11p ps=1.93e+06u
-M1027 VPWR SCE a_331_66# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=2.214e+11p ps=1.9e+06u
-M1028 VGND CLK a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1029 VGND a_1972_21# a_1866_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_213_47# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1031 Q_N a_2580_47# VGND VNB nshort w=520000u l=150000u
-+  ad=1.456e+11p pd=1.6e+06u as=0p ps=0u
-M1032 a_899_66# SCE a_700_389# VNB nshort w=420000u l=500000u
-+  ad=1.554e+11p pd=1.58e+06u as=0p ps=0u
-M1033 Q_N a_2580_47# VPWR VPB phighvt w=790000u l=180000u
-+  ad=2.291e+11p pd=2.16e+06u as=0p ps=0u
-M1034 a_1757_47# a_27_47# a_1380_303# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1322_47# a_213_47# a_1202_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND SCD a_899_66# VNB nshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_870_389# a_331_66# a_700_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND SCE a_331_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1039 a_1380_303# a_1202_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR RESET_B a_1324_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 VGND a_2580_47# Q_N VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
+X2 a_1972_21# a_1757_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_618_389# D a_700_389# VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X5 VGND a_1972_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VGND a_1202_413# a_1380_303# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_870_389# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X8 a_1322_47# a_1380_303# a_1428_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND a_27_47# a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_700_389# a_331_66# a_870_389# VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X11 a_700_389# SCE a_899_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=500000u
+X12 a_1202_413# a_213_47# a_1322_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X13 a_1757_47# a_27_47# a_1866_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X14 VPWR SCE a_618_389# VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X15 a_631_119# D a_700_389# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_331_66# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X17 a_331_66# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1866_47# a_1972_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VPWR a_1202_413# a_1380_303# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X20 a_1428_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_1324_413# a_1380_303# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X23 a_2580_47# a_1972_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=790000u l=180000u
+X24 a_1380_303# a_213_47# a_1757_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X25 a_1202_413# a_27_47# a_1324_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X26 a_1380_303# a_27_47# a_1757_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X27 a_2157_47# a_1757_47# a_1972_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_1757_47# a_213_47# a_1951_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X29 VPWR a_2580_47# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=790000u l=180000u
+X30 VPWR a_1972_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 a_700_389# a_213_47# a_1202_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X32 VGND RESET_B a_2157_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 VGND a_331_66# a_631_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_1951_413# a_1972_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X35 VPWR a_27_47# a_213_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X36 a_899_66# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=180000u
+X37 VPWR RESET_B a_1972_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X38 a_700_389# a_27_47# a_1202_413# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X39 a_2580_47# a_1972_21# VGND VNB sky130_fd_pr__nfet_01v8 w=520000u l=150000u
 .ends
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.cdl b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.cdl
index bce1744..82b4fe2 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.cdl
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_hdll__sdfrbp_2 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O Q_N:O
-MI642 clkneg CLK VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net92 S0 VNB nshort m=1 w=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=1 w=0.65 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
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net115 M1 VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 Q net92 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net103 net92 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net92 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI672 net171 net92 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=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
-MI670 Q_N net171 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MI33 net127 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nshort m=1 w=0.42 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.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 Q net92 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net103 net92 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI672 net171 net92 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 Q_N net171 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos 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
-MI662 net215 net92 VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net92 RESET_B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos 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
-MI658 net92 S0 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
-MI30 net194 M1 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
-MI31 M0 clkneg 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
-MI32 net194 RESET_B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI662 net215 net92 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 Q net92 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg 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
-MI633 sceb SCE VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI673 net171 net92 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI659 net92 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI671 Q_N net171 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI658 net92 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net194 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net194 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 Q net92 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI673 net171 net92 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI671 Q_N net171 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfrbp_2
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.netlist.tsv b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.netlist.tsv
index 0c1b38a..d4e68a5 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.netlist.tsv
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_hdll__sdfrbp_2	CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI642	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net92	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.36	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	net103	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	Q	net92	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net103	net92	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI672	MOSFET	net171	net92	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	Q_N	net171	VGND	VNB	nshort	2	0.65	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.18	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.5	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	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net215	net92	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net92	RESET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net215	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net92	S0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net194	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net194	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net194	RESET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	Q	net92	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI673	MOSFET	net171	net92	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI671	MOSFET	Q_N	net171	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net92	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.36	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	net103	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	Q	net92	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net103	net92	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI672	MOSFET	net171	net92	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	Q_N	net171	VGND	VNB	nfet_01v8	2	0.65	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.18	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.5	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	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net215	net92	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net194	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	Q	net92	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI673	MOSFET	net171	net92	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI671	MOSFET	Q_N	net171	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.spice b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.spice
index f620ce6..415707d 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.spice
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_hdll__sdfrbp_2 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 a_1428_47# a_1380_303# a_1322_47# VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.518e+11p ps=1.6e+06u
-M1001 a_213_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=1.77805e+12p ps=1.664e+07u
-M1002 VPWR a_1972_21# a_1951_413# VPB phighvt w=420000u l=180000u
-+  ad=2.2692e+12p pd=2.101e+07u as=1.386e+11p ps=1.5e+06u
-M1003 a_1972_21# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1004 Q_N a_2372_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1005 a_2157_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=0p ps=0u
-M1006 VPWR SCD a_870_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=1.971e+11p ps=1.81e+06u
-M1007 a_700_389# D a_631_119# VNB nshort w=420000u l=150000u
-+  ad=3.3215e+11p pd=3.47e+06u as=1.302e+11p ps=1.46e+06u
-M1008 a_1380_303# a_1202_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.541e+11p pd=2.37e+06u as=0p ps=0u
-M1009 a_1202_413# a_27_47# a_700_389# VNB nshort w=360000u l=150000u
-+  ad=1.44e+11p pd=1.52e+06u as=0p ps=0u
-M1010 VPWR a_1757_47# a_1972_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1972_21# a_1757_47# a_2157_47# VNB nshort w=420000u l=150000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1012 VPWR a_1380_303# a_1324_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1013 VPWR CLK a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1014 a_618_389# SCE VPWR VPB phighvt w=540000u l=180000u
-+  ad=1.242e+11p pd=1.54e+06u as=0p ps=0u
-M1015 Q a_1972_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.34e+11p pd=2.02e+06u as=0p ps=0u
-M1016 a_1951_413# a_213_47# a_1757_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1017 a_700_389# D a_618_389# VPB phighvt w=540000u l=180000u
-+  ad=5.193e+11p pd=4.01e+06u as=0p ps=0u
-M1018 a_631_119# a_331_66# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_1972_21# a_2372_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1020 VGND RESET_B a_1428_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_1972_21# a_2372_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1022 a_1324_413# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1202_413# a_213_47# a_700_389# VPB phighvt w=420000u l=180000u
-+  ad=1.806e+11p pd=1.7e+06u as=0p ps=0u
-M1024 a_1324_413# a_27_47# a_1202_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1866_47# a_27_47# a_1757_47# VNB nshort w=360000u l=150000u
-+  ad=2.121e+11p pd=1.9e+06u as=1.422e+11p ps=1.51e+06u
-M1026 a_1757_47# a_213_47# a_1380_303# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.87e+11p ps=1.93e+06u
-M1027 Q_N a_2372_47# VGND VNB nshort w=650000u l=150000u
-+  ad=2.0475e+11p pd=1.93e+06u as=0p ps=0u
-M1028 VPWR SCE a_331_66# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=2.214e+11p ps=1.9e+06u
-M1029 VGND CLK a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1030 VGND a_1972_21# a_1866_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_1972_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Q a_1972_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.3e+11p pd=2.66e+06u as=0p ps=0u
-M1033 VPWR a_1972_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_213_47# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1035 a_899_66# SCE a_700_389# VNB nshort w=420000u l=500000u
-+  ad=1.554e+11p pd=1.58e+06u as=0p ps=0u
-M1036 a_1757_47# a_27_47# a_1380_303# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1322_47# a_213_47# a_1202_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND a_2372_47# Q_N VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_2372_47# Q_N VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND SCD a_899_66# VNB nshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_870_389# a_331_66# a_700_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VGND SCE a_331_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1043 a_1380_303# a_1202_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_2372_47# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR RESET_B a_1324_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 a_2372_47# a_1972_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X3 a_1972_21# a_1757_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 VGND a_1972_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_618_389# D a_700_389# VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X7 VGND a_1202_413# a_1380_303# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 Q a_1972_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_870_389# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X10 a_1322_47# a_1380_303# a_1428_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND a_27_47# a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_700_389# a_331_66# a_870_389# VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X13 a_700_389# SCE a_899_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=500000u
+X14 a_1202_413# a_213_47# a_1322_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X15 a_1757_47# a_27_47# a_1866_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X16 VPWR SCE a_618_389# VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X17 a_631_119# D a_700_389# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_331_66# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X19 a_331_66# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR a_1972_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 a_1866_47# a_1972_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_2372_47# a_1972_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VPWR a_1202_413# a_1380_303# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X24 a_1428_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 a_1324_413# a_1380_303# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X27 a_1380_303# a_213_47# a_1757_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X28 a_1202_413# a_27_47# a_1324_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X29 a_1380_303# a_27_47# a_1757_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X30 Q_N a_2372_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 a_2157_47# a_1757_47# a_1972_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_1757_47# a_213_47# a_1951_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X33 a_700_389# a_213_47# a_1202_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X34 VGND RESET_B a_2157_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 VGND a_331_66# a_631_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 Q a_1972_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X37 a_1951_413# a_1972_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X38 VPWR a_27_47# a_213_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X39 a_899_66# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=180000u
+X40 Q_N a_2372_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X41 VPWR RESET_B a_1972_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X42 a_700_389# a_27_47# a_1202_413# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X43 VGND a_2372_47# Q_N VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.cdl b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.cdl
index f3d24b7..dba8500 100644
--- a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.cdl
+++ b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.cdl
@@ -17,76 +17,76 @@
 .SUBCKT sky130_fd_sc_hdll__sdfrtn_1 CLK_N D RESET_B SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK_N:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O
-MI642 clkpos CLK_N VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI642 clkpos CLK_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net87 net153 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net117 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net87 net153 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net110 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net117 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net98 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 net153 clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI33 net110 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net87 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net86 net87 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+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
-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.36 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.36 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 net98 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 net153 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net87 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net86 net87 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB 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.0 l=0.18 mult=1 sa=0.265
+MI643 clkpos CLK_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg clkpos VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB 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
-MI662 net190 net87 VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net87 RESET_B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI662 net190 net87 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 net153 clkpos VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI659 net87 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 net153 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net87 net153 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net87 net153 VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI30 net169 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net169 M1 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
-MI31 M0 clkneg 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
-MI32 net169 RESET_B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net87 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI32 net169 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net87 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg 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
-MI633 sceb SCE VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfrtn_1
diff --git a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.netlist.tsv b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.netlist.tsv
index eb7a67f..1bb3926 100644
--- a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.netlist.tsv
+++ b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net87	net153	net117	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net117	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net110	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	net98	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net98	M1	net110	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	net153	clkneg	net86	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net87	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net86	net87	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	net153	VNB	nshort	1	0.36	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.18	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.5	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	clkpos	CLK_N	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net190	net87	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net87	RESET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	net153	clkpos	net190	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net87	net153	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net169	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net169	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net169	RESET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net87	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	net153	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkpos	CLK_N	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net87	net153	net117	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net117	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	net110	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	net98	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net98	M1	net110	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	net153	clkneg	net86	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net87	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net86	net87	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	net153	VNB	nfet_01v8	1	0.36	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.18	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.5	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	clkpos	CLK_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net190	net87	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net87	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	net153	clkpos	net190	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net87	net153	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net169	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net169	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net169	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net87	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	net153	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.spice b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.spice
index 5da1c39..65b0f7e 100644
--- a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.spice
+++ b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_hdll__sdfrtn_1 CLK_N D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 a_1428_47# a_1380_303# a_1322_47# VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.518e+11p ps=1.6e+06u
-M1001 a_213_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=1.3533e+12p ps=1.268e+07u
-M1002 VPWR a_1972_21# a_1951_413# VPB phighvt w=420000u l=180000u
-+  ad=1.6398e+12p pd=1.569e+07u as=1.386e+11p ps=1.5e+06u
-M1003 a_1972_21# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1004 Q a_1972_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.15e+11p pd=2.63e+06u as=0p ps=0u
-M1005 a_2157_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=0p ps=0u
-M1006 VPWR SCD a_870_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=1.971e+11p ps=1.81e+06u
-M1007 a_700_389# D a_631_119# VNB nshort w=420000u l=150000u
-+  ad=3.3215e+11p pd=3.47e+06u as=1.302e+11p ps=1.46e+06u
-M1008 a_1380_303# a_1202_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.541e+11p pd=2.37e+06u as=0p ps=0u
-M1009 a_1202_413# a_213_47# a_700_389# VNB nshort w=360000u l=150000u
-+  ad=1.44e+11p pd=1.52e+06u as=0p ps=0u
-M1010 VPWR a_1757_47# a_1972_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1972_21# a_1757_47# a_2157_47# VNB nshort w=420000u l=150000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1012 Q a_1972_21# VGND VNB nshort w=650000u l=150000u
-+  ad=1.9825e+11p pd=1.91e+06u as=0p ps=0u
-M1013 VPWR a_1380_303# a_1324_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1014 VPWR CLK_N a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1015 a_618_389# SCE VPWR VPB phighvt w=540000u l=180000u
-+  ad=1.242e+11p pd=1.54e+06u as=0p ps=0u
-M1016 a_1951_413# a_27_47# a_1757_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1017 a_700_389# D a_618_389# VPB phighvt w=540000u l=180000u
-+  ad=5.193e+11p pd=4.01e+06u as=0p ps=0u
-M1018 a_631_119# a_331_66# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND RESET_B a_1428_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1324_413# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1202_413# a_27_47# a_700_389# VPB phighvt w=420000u l=180000u
-+  ad=1.806e+11p pd=1.7e+06u as=0p ps=0u
-M1022 a_1324_413# a_213_47# a_1202_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1866_47# a_213_47# a_1757_47# VNB nshort w=360000u l=150000u
-+  ad=2.121e+11p pd=1.9e+06u as=1.422e+11p ps=1.51e+06u
-M1024 a_1757_47# a_27_47# a_1380_303# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.87e+11p ps=1.93e+06u
-M1025 VPWR SCE a_331_66# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=2.214e+11p ps=1.9e+06u
-M1026 VGND CLK_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1027 VGND a_1972_21# a_1866_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_213_47# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1029 a_899_66# SCE a_700_389# VNB nshort w=420000u l=500000u
-+  ad=1.554e+11p pd=1.58e+06u as=0p ps=0u
-M1030 a_1757_47# a_213_47# a_1380_303# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1322_47# a_27_47# a_1202_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND SCD a_899_66# VNB nshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_870_389# a_331_66# a_700_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND SCE a_331_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1035 a_1380_303# a_1202_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR RESET_B a_1324_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 a_1972_21# a_1757_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 a_27_47# CLK_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_618_389# D a_700_389# VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X4 VGND a_1972_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VGND a_1202_413# a_1380_303# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_870_389# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X7 a_1322_47# a_1380_303# a_1428_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND a_27_47# a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_700_389# a_331_66# a_870_389# VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X10 a_700_389# SCE a_899_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=500000u
+X11 a_1202_413# a_27_47# a_1322_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X12 a_1757_47# a_213_47# a_1866_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X13 VPWR SCE a_618_389# VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X14 a_631_119# D a_700_389# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_331_66# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X16 a_331_66# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1866_47# a_1972_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VPWR a_1202_413# a_1380_303# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X19 a_1428_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_27_47# CLK_N VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 a_1324_413# a_1380_303# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X22 a_1380_303# a_27_47# a_1757_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X23 a_1202_413# a_213_47# a_1324_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X24 a_1380_303# a_213_47# a_1757_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X25 a_2157_47# a_1757_47# a_1972_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_1757_47# a_27_47# a_1951_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X27 VPWR a_1972_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 a_700_389# a_27_47# a_1202_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X29 VGND RESET_B a_2157_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 VGND a_331_66# a_631_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_1951_413# a_1972_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X32 VPWR a_27_47# a_213_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 a_899_66# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=180000u
+X34 VPWR RESET_B a_1972_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X35 a_700_389# a_213_47# a_1202_413# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
 .ends
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.cdl b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.cdl
index 119a7c4..816beda 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.cdl
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.cdl
@@ -17,76 +17,76 @@
 .SUBCKT sky130_fd_sc_hdll__sdfrtp_1 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O
-MI642 clkneg CLK VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net84 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net114 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net107 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.36 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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net95 M1 VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 Q net84 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net90 net84 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net84 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net114 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net107 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 net95 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 Q net84 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net90 net84 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos 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
-MI662 net187 net84 VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net84 RESET_B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos 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
-MI658 net84 S0 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
-MI30 net166 M1 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
-MI31 M0 clkneg 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
-MI32 net166 RESET_B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI662 net187 net84 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 Q net84 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI659 net84 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net84 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net166 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net166 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 Q net84 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg 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
-MI633 sceb SCE VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfrtp_1
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.netlist.tsv b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.netlist.tsv
index be9cfc0..f1f2e05 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.netlist.tsv
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net84	S0	net114	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net114	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net107	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	net95	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net95	M1	net107	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	S0	clkneg	net90	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	Q	net84	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net90	net84	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.36	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.18	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.5	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	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net187	net84	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net84	RESET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net187	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net84	S0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net166	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net166	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net166	RESET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	Q	net84	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net84	S0	net114	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net114	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net107	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	net95	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net95	M1	net107	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	S0	clkneg	net90	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	Q	net84	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net90	net84	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.36	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.18	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.5	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	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net187	net84	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net84	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	S0	clkpos	net187	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net84	S0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net166	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net166	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net166	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	Q	net84	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.spice b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.spice
index a276bb6..23a9f72 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.spice
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_hdll__sdfrtp_1 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 a_1428_47# a_1380_303# a_1322_47# VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.518e+11p ps=1.6e+06u
-M1001 a_213_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=1.3533e+12p ps=1.268e+07u
-M1002 VPWR a_1972_21# a_1951_413# VPB phighvt w=420000u l=180000u
-+  ad=1.6398e+12p pd=1.569e+07u as=1.386e+11p ps=1.5e+06u
-M1003 a_1972_21# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1004 Q a_1972_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.15e+11p pd=2.63e+06u as=0p ps=0u
-M1005 a_2157_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=0p ps=0u
-M1006 VPWR SCD a_870_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=1.971e+11p ps=1.81e+06u
-M1007 a_700_389# D a_631_119# VNB nshort w=420000u l=150000u
-+  ad=3.3215e+11p pd=3.47e+06u as=1.302e+11p ps=1.46e+06u
-M1008 a_1380_303# a_1202_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.541e+11p pd=2.37e+06u as=0p ps=0u
-M1009 a_1202_413# a_27_47# a_700_389# VNB nshort w=360000u l=150000u
-+  ad=1.44e+11p pd=1.52e+06u as=0p ps=0u
-M1010 VPWR a_1757_47# a_1972_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1972_21# a_1757_47# a_2157_47# VNB nshort w=420000u l=150000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1012 Q a_1972_21# VGND VNB nshort w=650000u l=150000u
-+  ad=1.9825e+11p pd=1.91e+06u as=0p ps=0u
-M1013 VPWR a_1380_303# a_1324_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1014 VPWR CLK a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1015 a_618_389# SCE VPWR VPB phighvt w=540000u l=180000u
-+  ad=1.242e+11p pd=1.54e+06u as=0p ps=0u
-M1016 a_1951_413# a_213_47# a_1757_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1017 a_700_389# D a_618_389# VPB phighvt w=540000u l=180000u
-+  ad=5.193e+11p pd=4.01e+06u as=0p ps=0u
-M1018 a_631_119# a_331_66# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND RESET_B a_1428_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1324_413# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1202_413# a_213_47# a_700_389# VPB phighvt w=420000u l=180000u
-+  ad=1.806e+11p pd=1.7e+06u as=0p ps=0u
-M1022 a_1324_413# a_27_47# a_1202_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1866_47# a_27_47# a_1757_47# VNB nshort w=360000u l=150000u
-+  ad=2.121e+11p pd=1.9e+06u as=1.422e+11p ps=1.51e+06u
-M1024 a_1757_47# a_213_47# a_1380_303# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.87e+11p ps=1.93e+06u
-M1025 VPWR SCE a_331_66# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=2.214e+11p ps=1.9e+06u
-M1026 VGND CLK a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1027 VGND a_1972_21# a_1866_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_213_47# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1029 a_899_66# SCE a_700_389# VNB nshort w=420000u l=500000u
-+  ad=1.554e+11p pd=1.58e+06u as=0p ps=0u
-M1030 a_1757_47# a_27_47# a_1380_303# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1322_47# a_213_47# a_1202_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND SCD a_899_66# VNB nshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_870_389# a_331_66# a_700_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND SCE a_331_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1035 a_1380_303# a_1202_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR RESET_B a_1324_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 a_1972_21# a_1757_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_618_389# D a_700_389# VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X4 VGND a_1972_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VGND a_1202_413# a_1380_303# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_870_389# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X7 a_1322_47# a_1380_303# a_1428_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND a_27_47# a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_700_389# a_331_66# a_870_389# VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X10 a_700_389# SCE a_899_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=500000u
+X11 a_1202_413# a_213_47# a_1322_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X12 a_1757_47# a_27_47# a_1866_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X13 VPWR SCE a_618_389# VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X14 a_631_119# D a_700_389# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_331_66# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X16 a_331_66# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1866_47# a_1972_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VPWR a_1202_413# a_1380_303# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X19 a_1428_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 a_1324_413# a_1380_303# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X22 a_1380_303# a_213_47# a_1757_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X23 a_1202_413# a_27_47# a_1324_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X24 a_1380_303# a_27_47# a_1757_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X25 a_2157_47# a_1757_47# a_1972_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_1757_47# a_213_47# a_1951_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X27 VPWR a_1972_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 a_700_389# a_213_47# a_1202_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X29 VGND RESET_B a_2157_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 VGND a_331_66# a_631_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_1951_413# a_1972_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X32 VPWR a_27_47# a_213_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 a_899_66# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=180000u
+X34 VPWR RESET_B a_1972_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X35 a_700_389# a_27_47# a_1202_413# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
 .ends
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.cdl b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.cdl
index 1007e47..b92502d 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.cdl
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.cdl
@@ -17,76 +17,76 @@
 .SUBCKT sky130_fd_sc_hdll__sdfrtp_2 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O
-MI642 clkneg CLK VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net84 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net114 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net107 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.36 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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net95 M1 VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 Q net84 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net90 net84 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net84 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net114 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net107 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 net95 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 Q net84 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net90 net84 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos 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
-MI662 net187 net84 VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net84 RESET_B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos 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
-MI658 net84 S0 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
-MI30 net166 M1 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
-MI31 M0 clkneg 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
-MI32 net166 RESET_B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI662 net187 net84 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 Q net84 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI659 net84 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net84 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net166 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net166 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 Q net84 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg 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
-MI633 sceb SCE VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfrtp_2
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.netlist.tsv b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.netlist.tsv
index 66bdd77..65ceaed 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.netlist.tsv
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net84	S0	net114	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net114	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net107	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	net95	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net95	M1	net107	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	S0	clkneg	net90	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	Q	net84	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net90	net84	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.36	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.18	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.5	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	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net187	net84	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net84	RESET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net187	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net84	S0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net166	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net166	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net166	RESET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	Q	net84	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net84	S0	net114	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net114	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net107	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	net95	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net95	M1	net107	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	S0	clkneg	net90	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	Q	net84	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net90	net84	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.36	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.18	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.5	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	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net187	net84	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net84	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	S0	clkpos	net187	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net84	S0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net166	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net166	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net166	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	Q	net84	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.spice b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.spice
index 735b202..3bc3d83 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.spice
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_hdll__sdfrtp_2 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 a_1428_47# a_1380_303# a_1322_47# VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.518e+11p ps=1.6e+06u
-M1001 a_213_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=1.6198e+12p ps=1.48e+07u
-M1002 Q a_1972_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=2.0598e+12p ps=1.853e+07u
-M1003 VPWR a_1972_21# a_1951_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
-M1004 a_1972_21# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1005 a_2157_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=0p ps=0u
-M1006 VPWR SCD a_870_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=1.971e+11p ps=1.81e+06u
-M1007 a_700_389# D a_631_119# VNB nshort w=420000u l=150000u
-+  ad=3.3215e+11p pd=3.47e+06u as=1.302e+11p ps=1.46e+06u
-M1008 a_1380_303# a_1202_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.541e+11p pd=2.37e+06u as=0p ps=0u
-M1009 a_1202_413# a_27_47# a_700_389# VNB nshort w=360000u l=150000u
-+  ad=1.44e+11p pd=1.52e+06u as=0p ps=0u
-M1010 VPWR a_1757_47# a_1972_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1972_21# a_1757_47# a_2157_47# VNB nshort w=420000u l=150000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1012 VPWR a_1380_303# a_1324_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1013 VPWR CLK a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1014 a_618_389# SCE VPWR VPB phighvt w=540000u l=180000u
-+  ad=1.242e+11p pd=1.54e+06u as=0p ps=0u
-M1015 a_1951_413# a_213_47# a_1757_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1016 VGND a_1972_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1017 a_700_389# D a_618_389# VPB phighvt w=540000u l=180000u
-+  ad=5.193e+11p pd=4.01e+06u as=0p ps=0u
-M1018 a_631_119# a_331_66# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Q a_1972_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND RESET_B a_1428_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1324_413# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1202_413# a_213_47# a_700_389# VPB phighvt w=420000u l=180000u
-+  ad=1.806e+11p pd=1.7e+06u as=0p ps=0u
-M1023 a_1324_413# a_27_47# a_1202_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1866_47# a_27_47# a_1757_47# VNB nshort w=360000u l=150000u
-+  ad=2.121e+11p pd=1.9e+06u as=1.422e+11p ps=1.51e+06u
-M1025 a_1757_47# a_213_47# a_1380_303# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.87e+11p ps=1.93e+06u
-M1026 VPWR SCE a_331_66# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=2.214e+11p ps=1.9e+06u
-M1027 VGND CLK a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1028 VGND a_1972_21# a_1866_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_213_47# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1030 VPWR a_1972_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_899_66# SCE a_700_389# VNB nshort w=420000u l=500000u
-+  ad=1.554e+11p pd=1.58e+06u as=0p ps=0u
-M1032 a_1757_47# a_27_47# a_1380_303# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1322_47# a_213_47# a_1202_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND SCD a_899_66# VNB nshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_870_389# a_331_66# a_700_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND SCE a_331_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1037 a_1380_303# a_1202_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Q a_1972_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR RESET_B a_1324_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 VPWR a_1972_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_1972_21# a_1757_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_618_389# D a_700_389# VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X6 VGND a_1202_413# a_1380_303# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_870_389# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X8 a_1322_47# a_1380_303# a_1428_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND a_27_47# a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 Q a_1972_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_700_389# a_331_66# a_870_389# VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X12 a_700_389# SCE a_899_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=500000u
+X13 a_1202_413# a_213_47# a_1322_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X14 a_1757_47# a_27_47# a_1866_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X15 VPWR SCE a_618_389# VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X16 a_631_119# D a_700_389# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_331_66# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X18 a_331_66# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_1866_47# a_1972_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR a_1202_413# a_1380_303# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X21 a_1428_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 a_1324_413# a_1380_303# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X24 a_1380_303# a_213_47# a_1757_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X25 a_1202_413# a_27_47# a_1324_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X26 a_1380_303# a_27_47# a_1757_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X27 a_2157_47# a_1757_47# a_1972_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VGND a_1972_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 a_1757_47# a_213_47# a_1951_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X30 a_700_389# a_213_47# a_1202_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X31 VGND RESET_B a_2157_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 VGND a_331_66# a_631_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_1951_413# a_1972_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X34 VPWR a_27_47# a_213_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 a_899_66# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=180000u
+X36 VPWR RESET_B a_1972_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X37 a_700_389# a_27_47# a_1202_413# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
 .ends
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.cdl b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.cdl
index ddfcde2..5f69e1c 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.cdl
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.cdl
@@ -17,76 +17,76 @@
 .SUBCKT sky130_fd_sc_hdll__sdfrtp_4 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O
-MI642 clkneg CLK VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net84 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net114 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net107 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.36 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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net95 M1 VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 Q net84 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net83 net84 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net84 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net114 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net107 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 net95 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 Q net84 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net83 net84 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos 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
-MI662 net187 net84 VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net84 RESET_B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos 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
-MI658 net84 S0 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
-MI30 net166 M1 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
-MI31 M0 clkneg 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
-MI32 net166 RESET_B VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI662 net187 net84 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 Q net84 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI659 net84 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net84 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net166 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net166 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 Q net84 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg 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
-MI633 sceb SCE VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfrtp_4
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.netlist.tsv b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.netlist.tsv
index f5a2a44..4a4c0c9 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.netlist.tsv
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net84	S0	net114	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net114	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net107	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	net95	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net95	M1	net107	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	S0	clkneg	net83	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	Q	net84	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net83	net84	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.36	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.18	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.5	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	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net187	net84	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net84	RESET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net187	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net84	S0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net166	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net166	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net166	RESET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	Q	net84	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net84	S0	net114	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net114	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net107	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	net95	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net95	M1	net107	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	S0	clkneg	net83	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	Q	net84	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net83	net84	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.36	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.18	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.5	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	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net187	net84	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net84	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	S0	clkpos	net187	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net84	S0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net166	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net166	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net166	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	Q	net84	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.54	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.spice b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.spice
index 8dc8126..c5025ef 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.spice
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.spice
@@ -16,88 +16,46 @@
 
 
 .subckt sky130_fd_sc_hdll__sdfrtp_4 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 a_1428_47# a_1380_303# a_1322_47# VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.518e+11p ps=1.6e+06u
-M1001 Q a_1972_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6.45e+11p pd=5.29e+06u as=2.2648e+12p ps=2.094e+07u
-M1002 a_213_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=1.7043e+12p ps=1.636e+07u
-M1003 VPWR a_1972_21# a_1951_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
-M1004 a_1972_21# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1005 Q a_1972_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_2157_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=0p ps=0u
-M1007 VPWR SCD a_870_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=1.971e+11p ps=1.81e+06u
-M1008 a_700_389# D a_631_119# VNB nshort w=420000u l=150000u
-+  ad=3.3215e+11p pd=3.47e+06u as=1.302e+11p ps=1.46e+06u
-M1009 a_1380_303# a_1202_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.541e+11p pd=2.37e+06u as=0p ps=0u
-M1010 a_1202_413# a_27_47# a_700_389# VNB nshort w=360000u l=150000u
-+  ad=1.44e+11p pd=1.52e+06u as=0p ps=0u
-M1011 VPWR a_1757_47# a_1972_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1972_21# a_1757_47# a_2157_47# VNB nshort w=420000u l=150000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1013 VGND a_1972_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.265e+11p ps=4.22e+06u
-M1014 VGND a_1972_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_1380_303# a_1324_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1016 VPWR CLK a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1017 a_618_389# SCE VPWR VPB phighvt w=540000u l=180000u
-+  ad=1.242e+11p pd=1.54e+06u as=0p ps=0u
-M1018 a_1951_413# a_213_47# a_1757_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1019 Q a_1972_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_700_389# D a_618_389# VPB phighvt w=540000u l=180000u
-+  ad=5.193e+11p pd=4.01e+06u as=0p ps=0u
-M1021 a_631_119# a_331_66# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND RESET_B a_1428_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1324_413# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_1972_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1202_413# a_213_47# a_700_389# VPB phighvt w=420000u l=180000u
-+  ad=1.806e+11p pd=1.7e+06u as=0p ps=0u
-M1026 a_1324_413# a_27_47# a_1202_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1866_47# a_27_47# a_1757_47# VNB nshort w=360000u l=150000u
-+  ad=2.121e+11p pd=1.9e+06u as=1.422e+11p ps=1.51e+06u
-M1028 a_1757_47# a_213_47# a_1380_303# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.87e+11p ps=1.93e+06u
-M1029 Q a_1972_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR SCE a_331_66# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=2.214e+11p ps=1.9e+06u
-M1031 VGND CLK a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1032 VGND a_1972_21# a_1866_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_213_47# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1034 a_899_66# SCE a_700_389# VNB nshort w=420000u l=500000u
-+  ad=1.554e+11p pd=1.58e+06u as=0p ps=0u
-M1035 a_1757_47# a_27_47# a_1380_303# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1322_47# a_213_47# a_1202_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR a_1972_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND SCD a_899_66# VNB nshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_870_389# a_331_66# a_700_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND SCE a_331_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1041 a_1380_303# a_1202_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR RESET_B a_1324_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 Q a_1972_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 Q a_1972_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_1972_21# a_1757_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 VGND a_1972_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_618_389# D a_700_389# VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X7 VGND a_1202_413# a_1380_303# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_870_389# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X9 a_1322_47# a_1380_303# a_1428_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND a_27_47# a_213_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_700_389# a_331_66# a_870_389# VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X12 a_700_389# SCE a_899_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=500000u
+X13 a_1202_413# a_213_47# a_1322_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X14 a_1757_47# a_27_47# a_1866_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X15 VGND a_1972_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VPWR SCE a_618_389# VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X17 a_631_119# D a_700_389# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VPWR a_1972_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_331_66# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=540000u l=180000u
+X20 a_331_66# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_1866_47# a_1972_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 VPWR a_1202_413# a_1380_303# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X23 a_1428_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_1324_413# a_1380_303# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X26 Q a_1972_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 a_1380_303# a_213_47# a_1757_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X28 Q a_1972_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 a_1202_413# a_27_47# a_1324_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X30 a_1380_303# a_27_47# a_1757_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X31 a_2157_47# a_1757_47# a_1972_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_1757_47# a_213_47# a_1951_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X33 VPWR a_1972_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X34 a_700_389# a_213_47# a_1202_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X35 VGND RESET_B a_2157_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 VGND a_331_66# a_631_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_1951_413# a_1972_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X38 VPWR a_27_47# a_213_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X39 a_899_66# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=180000u
+X40 VPWR RESET_B a_1972_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X41 a_700_389# a_27_47# a_1202_413# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
 .ends
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.cdl b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.cdl
index 96da9c0..321ca7e 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.cdl
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.cdl
@@ -17,88 +17,88 @@
 .SUBCKT sky130_fd_sc_hdll__sdfsbp_1 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net159 M1 VPB 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
-MI664 M0 clkneg 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
-MI6 net138 S1 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
-MI43 db clkpos 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
-MI45 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkpos VPB 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
-MI658 M1 M0 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
-MI661 Q_N S0 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
-MI659 M1 SET_B 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
-MI645 sceb SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net199 S0 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net199 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B 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
-MI648 S1 S0 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
-MI38 S0 clkneg VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net98 M0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI27 net243 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net227 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net199 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net215 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI662 net159 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net138 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net199 S0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net199 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net98 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI27 net243 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 S1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.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
+MI657 net227 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net199 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net215 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 Q_N S0 VNB nfet_01v8 m=1 w=0.65 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
+MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net199 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net199 S0 VNB nshort m=1 w=0.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 net206 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net230 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net206 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 net230 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfsbp_1
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.netlist.tsv b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.netlist.tsv
index a015286..364e22f 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.netlist.tsv
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_hdll__sdfsbp_1	CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net159	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net159	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net138	S1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net138	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	S0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net199	S0	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net199	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net98	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net98	M0	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI27	MOSFET	net243	S1	net215	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net230	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net227	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net199	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net215	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	S0	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net206	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net199	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net227	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net206	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net230	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net243	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net159	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net159	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net138	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkpos	net138	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	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	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net199	S0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net199	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net98	VPB	pfet_01v8_hvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net98	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI27	MOSFET	net243	S1	net215	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net230	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net227	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net199	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net215	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	S0	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net206	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net199	S0	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	net227	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net206	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net230	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net243	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.spice b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.spice
index 7437bc7..e3d55cd 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.spice
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.spice
@@ -16,88 +16,46 @@
 
 
 .subckt sky130_fd_sc_hdll__sdfsbp_1 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
-M1000 VGND a_349_21# a_295_47# VNB nshort w=420000u l=150000u
-+  ad=1.4601e+12p pd=1.494e+07u as=1.134e+11p ps=1.38e+06u
-M1001 a_1930_295# a_1735_329# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1002 Q a_2632_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=1.9705e+12p ps=1.846e+07u
-M1003 a_1930_295# a_1735_329# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1004 a_1075_413# a_877_369# a_199_47# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.99e+11p ps=3.24e+06u
-M1005 VGND SCE a_349_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1006 a_1735_329# a_877_369# a_1655_47# VNB nshort w=640000u l=150000u
-+  ad=3.054e+11p pd=2.42e+06u as=4.736e+11p ps=2.76e+06u
-M1007 VPWR SCD a_27_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=3.456e+11p ps=3.64e+06u
-M1008 a_1219_21# a_1075_413# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.701e+11p pd=1.65e+06u as=0p ps=0u
-M1009 a_1870_413# a_877_369# a_1735_329# VPB phighvt w=420000u l=180000u
-+  ad=1.302e+11p pd=1.46e+06u as=4.305e+11p ps=4.05e+06u
-M1010 a_1655_47# a_1075_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Q a_2632_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1012 VPWR SCE a_349_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1013 a_1735_329# a_693_369# a_1652_329# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=1.974e+11p ps=2.15e+06u
-M1014 a_1735_329# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND CLK a_693_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1016 a_877_369# a_693_369# VGND VNB nshort w=420000u l=150000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1017 VPWR a_1930_295# a_1870_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1467_47# a_1075_413# a_1219_21# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.512e+11p ps=1.56e+06u
-M1019 a_27_369# a_349_21# a_199_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR SET_B a_1219_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1177_47# a_877_369# a_1075_413# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.344e+11p ps=1.48e+06u
-M1022 VGND SET_B a_1467_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_877_369# a_693_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1024 a_199_47# SCE a_109_47# VNB nshort w=420000u l=150000u
-+  ad=2.688e+11p pd=2.96e+06u as=1.26e+11p ps=1.44e+06u
-M1025 VGND a_1219_21# a_1177_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Q_N a_1735_329# VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
-M1027 a_1075_413# a_693_369# a_199_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_295_47# D a_199_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1652_329# a_1075_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_1735_329# a_2632_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1031 a_211_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.472e+11p pd=1.74e+06u as=0p ps=0u
-M1032 Q_N a_1735_329# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1033 a_109_47# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_2049_47# a_1930_295# a_1977_47# VNB nshort w=420000u l=150000u
-+  ad=2.688e+11p pd=2.12e+06u as=8.82e+10p ps=1.26e+06u
-M1035 VGND a_1735_329# a_2632_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1036 a_199_47# D a_211_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1169_413# a_693_369# a_1075_413# VPB phighvt w=420000u l=180000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1038 VPWR a_1219_21# a_1169_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND SET_B a_2049_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VPWR CLK a_693_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1041 a_1977_47# a_693_369# a_1735_329# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_369# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X1 VGND a_693_369# a_877_369# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_1467_47# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_1870_413# a_1930_295# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X4 a_1075_413# a_877_369# a_1177_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_199_47# a_349_21# a_27_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X6 a_211_369# D a_199_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X7 a_349_21# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X8 a_1075_413# a_693_369# a_1169_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X9 a_693_369# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_199_47# a_877_369# a_1075_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X11 VPWR a_1075_413# a_1652_329# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X12 a_349_21# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_1219_21# a_1075_413# a_1467_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_1169_413# a_1219_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X15 VPWR a_1735_329# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 a_1219_21# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X17 a_199_47# a_693_369# a_1075_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VGND a_1075_413# a_1655_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 VPWR a_2632_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VPWR SCE a_211_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X21 a_1735_329# a_693_369# a_1977_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 VPWR a_693_369# a_877_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X23 a_295_47# a_349_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_2632_47# a_1735_329# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X25 a_693_369# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X26 a_1652_329# a_693_369# a_1735_329# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X27 a_1977_47# a_1930_295# a_2049_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_2632_47# a_1735_329# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VGND SCD a_109_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_199_47# D a_295_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 VPWR a_1735_329# a_1930_295# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X32 a_1177_47# a_1219_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_1655_47# a_877_369# a_1735_329# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X34 a_2049_47# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 VGND a_1735_329# a_1930_295# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 VPWR a_1075_413# a_1219_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X37 a_109_47# SCE a_199_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 VGND a_2632_47# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X39 a_1735_329# a_877_369# a_1870_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X40 VPWR SET_B a_1735_329# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X41 VGND a_1735_329# Q_N VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.cdl b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.cdl
index 2c74d66..c7aff70 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.cdl
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.cdl
@@ -17,88 +17,88 @@
 .SUBCKT sky130_fd_sc_hdll__sdfsbp_2 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 sceb SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB 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
-MI47 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net195 S0 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net195 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B 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
-MI662 net130 M1 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
-MI664 M0 clkneg 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
-MI6 net122 S1 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
-MI669 S0 clkpos 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
-MI24 S0 SET_B 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
-MI648 S1 S0 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
-MI38 S0 clkneg VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net107 M0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB 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
-MI45 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N S0 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI34 S0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net239 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net223 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net242 M0 VNB nshort m=1 w=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
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net226 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net195 S0 VNB nshort m=1 w=0.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 net187 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI645 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net195 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net195 S0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net195 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net130 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net122 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net107 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N S0 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI34 S0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net239 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 S1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N S0 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net223 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 net242 M0 VNB nfet_01v8 m=1 w=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 net226 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net195 S0 VNB nfet_01v8 m=1 w=0.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 net187 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net195 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 Q_N S0 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfsbp_2
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.netlist.tsv b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.netlist.tsv
index 169242c..9832fb8 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.netlist.tsv
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_hdll__sdfsbp_2	CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net195	S0	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net195	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net130	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net130	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net122	S1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net122	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net107	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net107	M0	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	S0	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI34	MOSFET	S0	clkpos	net242	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net239	S1	net187	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net223	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net226	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net223	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net242	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net239	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.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	net226	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net195	S0	VGND	VNB	nshort	1	0.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	net187	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net195	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	S0	VGND	VNB	nshort	2	0.65	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net195	S0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net195	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net130	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net130	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net122	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkpos	net122	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net107	VPB	pfet_01v8_hvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net107	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	S0	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI34	MOSFET	S0	clkpos	net242	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net239	S1	net187	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net223	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net226	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net223	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net242	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net239	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.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	net226	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net195	S0	VGND	VNB	nfet_01v8	1	0.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	net187	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net195	VGND	VNB	nfet_01v8	2	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.spice b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.spice
index 8897c49..4d58669 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.spice
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.spice
@@ -16,96 +16,50 @@
 
 
 .subckt sky130_fd_sc_hdll__sdfsbp_2 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
-M1000 VGND a_349_21# a_295_47# VNB nshort w=420000u l=150000u
-+  ad=1.90535e+12p pd=1.891e+07u as=1.134e+11p ps=1.38e+06u
-M1001 a_1930_295# a_1735_329# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1002 a_1930_295# a_1735_329# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=2.6255e+12p ps=2.377e+07u
-M1003 a_1075_413# a_877_369# a_199_47# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.99e+11p ps=3.24e+06u
-M1004 VGND SCE a_349_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1005 a_1735_329# a_877_369# a_1655_47# VNB nshort w=640000u l=150000u
-+  ad=3.054e+11p pd=2.42e+06u as=4.736e+11p ps=2.76e+06u
-M1006 Q a_2739_47# VGND VNB nshort w=650000u l=150000u
-+  ad=2.08e+11p pd=1.94e+06u as=0p ps=0u
-M1007 VPWR SCD a_27_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=3.456e+11p ps=3.64e+06u
-M1008 a_1219_21# a_1075_413# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.701e+11p pd=1.65e+06u as=0p ps=0u
-M1009 a_1870_413# a_877_369# a_1735_329# VPB phighvt w=420000u l=180000u
-+  ad=1.302e+11p pd=1.46e+06u as=4.305e+11p ps=4.05e+06u
-M1010 a_1655_47# a_1075_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR SCE a_349_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1012 a_1735_329# a_693_369# a_1652_329# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=1.974e+11p ps=2.15e+06u
-M1013 a_1735_329# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_2739_47# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1015 VGND a_1735_329# Q_N VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1016 VPWR a_1735_329# a_2739_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1017 VGND CLK a_693_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1018 a_877_369# a_693_369# VGND VNB nshort w=420000u l=150000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1019 VPWR a_1735_329# Q_N VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1020 VPWR a_1930_295# a_1870_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1467_47# a_1075_413# a_1219_21# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.512e+11p ps=1.56e+06u
-M1022 a_27_369# a_349_21# a_199_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR SET_B a_1219_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1177_47# a_877_369# a_1075_413# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.344e+11p ps=1.48e+06u
-M1025 VGND SET_B a_1467_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Q a_2739_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_877_369# a_693_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1028 a_199_47# SCE a_109_47# VNB nshort w=420000u l=150000u
-+  ad=2.688e+11p pd=2.96e+06u as=1.26e+11p ps=1.44e+06u
-M1029 VGND a_1219_21# a_1177_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Q_N a_1735_329# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1075_413# a_693_369# a_199_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_295_47# D a_199_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND a_1735_329# a_2739_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1034 VGND a_2739_47# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1652_329# a_1075_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_211_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.472e+11p pd=1.74e+06u as=0p ps=0u
-M1037 Q_N a_1735_329# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_109_47# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_2049_47# a_1930_295# a_1977_47# VNB nshort w=420000u l=150000u
-+  ad=2.688e+11p pd=2.12e+06u as=8.82e+10p ps=1.26e+06u
-M1040 a_199_47# D a_211_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_1169_413# a_693_369# a_1075_413# VPB phighvt w=420000u l=180000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1042 VPWR a_1219_21# a_1169_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND SET_B a_2049_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VPWR CLK a_693_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1045 a_1977_47# a_693_369# a_1735_329# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_369# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X1 VGND a_693_369# a_877_369# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 Q a_2739_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 a_1467_47# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_1870_413# a_1930_295# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 VPWR a_2739_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_1075_413# a_877_369# a_1177_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_199_47# a_349_21# a_27_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X8 a_211_369# D a_199_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X9 a_349_21# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X10 a_1075_413# a_693_369# a_1169_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X11 a_693_369# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_2739_47# a_1735_329# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X13 Q_N a_1735_329# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_199_47# a_877_369# a_1075_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X15 VPWR a_1075_413# a_1652_329# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X16 a_349_21# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1219_21# a_1075_413# a_1467_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1169_413# a_1219_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X19 VPWR a_1735_329# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 Q_N a_1735_329# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 a_1219_21# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X22 a_199_47# a_693_369# a_1075_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VGND a_1075_413# a_1655_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 VPWR SCE a_211_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X25 a_1735_329# a_693_369# a_1977_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VPWR a_693_369# a_877_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X27 a_295_47# a_349_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_2739_47# a_1735_329# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_693_369# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X30 a_1652_329# a_693_369# a_1735_329# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X31 a_1977_47# a_1930_295# a_2049_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 VGND SCD a_109_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_199_47# D a_295_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 Q a_2739_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X35 VPWR a_1735_329# a_1930_295# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X36 a_1177_47# a_1219_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_1655_47# a_877_369# a_1735_329# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X38 a_2049_47# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 VGND a_1735_329# a_1930_295# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 VGND a_2739_47# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X41 VPWR a_1075_413# a_1219_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X42 a_109_47# SCE a_199_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X43 a_1735_329# a_877_369# a_1870_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X44 VPWR SET_B a_1735_329# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X45 VGND a_1735_329# Q_N VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.cdl b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.cdl
index d9d99db..d4732b7 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.cdl
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.cdl
@@ -16,84 +16,84 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdfstp_1 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI645 sceb SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB 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
-MI47 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI645 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net165 S0 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net165 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
-MI659 M1 SET_B 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
-MI662 net109 M1 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
-MI664 M0 clkneg 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
-MI6 net96 S1 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
-MI669 S0 clkpos 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
-MI24 S0 SET_B 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
-MI648 S1 S0 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
-MI38 S0 clkneg VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net84 M0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB 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
-MI45 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 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.18 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.18 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.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MI660 Q net165 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net109 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net96 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net84 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-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.18 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.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB 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_hdll__sdfstp_1
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.netlist.tsv b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.netlist.tsv
index e89eafe..041deb6 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.netlist.tsv
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net165	S0	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net165	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net109	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net109	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net96	S1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net96	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net84	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net84	M0	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.18	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.65	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net165	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.65	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_hdll__sdfstp_1.spice b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.spice
index 6400210..0147ea9 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.spice
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_hdll__sdfstp_1 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
-M1000 VPWR SET_B a_1229_21# VPB phighvt w=420000u l=180000u
-+  ad=1.5997e+12p pd=1.544e+07u as=1.722e+11p ps=1.66e+06u
-M1001 VGND a_349_21# a_295_47# VNB nshort w=420000u l=150000u
-+  ad=1.2848e+12p pd=1.309e+07u as=1.134e+11p ps=1.38e+06u
-M1002 Q a_2381_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1003 a_1955_47# a_693_369# a_1725_329# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.482e+11p ps=2.2e+06u
-M1004 VPWR a_1725_329# a_2381_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1005 VGND SCE a_349_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1006 a_1075_413# a_877_369# a_201_47# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.99e+11p ps=3.24e+06u
-M1007 a_1725_329# a_877_369# a_1645_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=5.056e+11p ps=2.86e+06u
-M1008 VPWR SCD a_27_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=3.456e+11p ps=3.64e+06u
-M1009 a_1229_21# a_1075_413# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1841_413# a_877_369# a_1725_329# VPB phighvt w=420000u l=180000u
-+  ad=1.722e+11p pd=1.66e+06u as=3.906e+11p ps=3.86e+06u
-M1011 a_1725_329# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR SCE a_349_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1013 a_1725_329# a_693_369# a_1643_329# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=1.932e+11p ps=2.14e+06u
-M1014 a_1921_295# a_1725_329# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1015 a_877_369# a_693_369# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1016 VGND a_1229_21# a_1177_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1017 VGND CLK a_693_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1018 a_1645_47# a_1075_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_1921_295# a_1841_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1467_47# a_1075_413# a_1229_21# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.512e+11p ps=1.56e+06u
-M1021 a_27_369# a_349_21# a_201_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_119_47# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1023 a_1177_47# a_877_369# a_1075_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1024 VGND SET_B a_1467_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_877_369# a_693_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1026 a_1075_413# a_693_369# a_201_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1027 a_2027_47# a_1921_295# a_1955_47# VNB nshort w=420000u l=150000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1028 a_1643_329# a_1075_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_295_47# D a_201_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_201_47# SCE a_119_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND SET_B a_2027_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND a_1725_329# a_2381_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1033 a_211_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.472e+11p pd=1.74e+06u as=0p ps=0u
-M1034 a_1921_295# a_1725_329# VGND VNB nshort w=420000u l=150000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1035 Q a_2381_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1036 a_201_47# D a_211_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1169_413# a_693_369# a_1075_413# VPB phighvt w=420000u l=180000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1038 VPWR a_1229_21# a_1169_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR CLK a_693_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
+X0 VGND a_693_369# a_877_369# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_27_369# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X2 a_1467_47# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_119_47# SCE a_201_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR a_2381_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_1075_413# a_877_369# a_1177_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR SET_B a_1725_329# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 a_2381_47# a_1725_329# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X8 VGND a_1725_329# a_1921_295# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_201_47# a_349_21# a_27_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X10 a_211_369# D a_201_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X11 a_349_21# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X12 a_1075_413# a_693_369# a_1169_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X13 a_693_369# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_2027_47# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_1841_413# a_1921_295# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X16 a_201_47# a_877_369# a_1075_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X17 a_349_21# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1229_21# a_1075_413# a_1467_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_1169_413# a_1229_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X20 a_201_47# a_693_369# a_1075_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 VPWR SCE a_211_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X22 VGND SCD a_119_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_1725_329# a_693_369# a_1955_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR a_693_369# a_877_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X25 VPWR a_1075_413# a_1229_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X26 a_295_47# a_349_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_1177_47# a_1229_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_1955_47# a_1921_295# a_2027_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VPWR a_1075_413# a_1643_329# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X30 a_1725_329# a_877_369# a_1841_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X31 a_693_369# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X32 VGND a_1075_413# a_1645_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X33 a_201_47# D a_295_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_1229_21# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X35 a_2381_47# a_1725_329# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 VGND a_2381_47# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X37 VPWR a_1725_329# a_1921_295# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X38 a_1645_47# a_877_369# a_1725_329# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X39 a_1643_329# a_693_369# a_1725_329# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
 .ends
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.cdl b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.cdl
index 7331676..8a23f2b 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.cdl
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.cdl
@@ -16,84 +16,84 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdfstp_2 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI645 sceb SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB 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
-MI47 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI645 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net165 S0 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net165 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B 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
-MI662 net109 M1 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
-MI664 M0 clkneg 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
-MI6 net96 S1 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
-MI669 S0 clkpos 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
-MI24 S0 SET_B 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
-MI648 S1 S0 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
-MI38 S0 clkneg VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net84 M0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB 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
-MI45 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 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.18 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.18 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.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MI660 Q net165 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net109 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net96 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net84 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-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.18 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=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB 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_hdll__sdfstp_2
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.netlist.tsv b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.netlist.tsv
index ca0f77a..69c29f2 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.netlist.tsv
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net165	S0	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net165	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net109	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net109	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net96	S1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net96	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net84	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net84	M0	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.18	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	2	0.65	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net165	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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	2	0.65	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_hdll__sdfstp_2.spice b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.spice
index fef5f02..69d660a 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.spice
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.spice
@@ -16,88 +16,46 @@
 
 
 .subckt sky130_fd_sc_hdll__sdfstp_2 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
-M1000 VPWR SET_B a_1229_21# VPB phighvt w=420000u l=180000u
-+  ad=2.0718e+12p pd=1.868e+07u as=1.722e+11p ps=1.66e+06u
-M1001 VGND a_349_21# a_295_47# VNB nshort w=420000u l=150000u
-+  ad=1.50395e+12p pd=1.505e+07u as=1.134e+11p ps=1.38e+06u
-M1002 a_2067_47# a_1951_295# a_1995_47# VNB nshort w=420000u l=150000u
-+  ad=2.016e+11p pd=1.8e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_1745_329# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=4.746e+11p pd=4.26e+06u as=0p ps=0u
-M1004 a_1951_295# a_1745_329# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1005 a_1995_47# a_693_369# a_1745_329# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.332e+11p ps=2.5e+06u
-M1006 a_1891_413# a_877_369# a_1745_329# VPB phighvt w=420000u l=180000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1007 VGND SCE a_349_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1008 a_1075_413# a_877_369# a_201_47# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.99e+11p ps=3.24e+06u
-M1009 VPWR SCD a_27_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=3.456e+11p ps=3.64e+06u
-M1010 a_1229_21# a_1075_413# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR SCE a_349_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1012 VGND SET_B a_2067_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_2447_47# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1014 VGND SET_B a_1467_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1015 a_877_369# a_693_369# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1016 VGND a_1229_21# a_1177_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1017 VPWR a_1951_295# a_1891_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND CLK a_693_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1019 a_1951_295# a_1745_329# VGND VNB nshort w=420000u l=150000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1020 a_1654_47# a_1075_413# VGND VNB nshort w=640000u l=150000u
-+  ad=5.088e+11p pd=2.87e+06u as=0p ps=0u
-M1021 a_1467_47# a_1075_413# a_1229_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.512e+11p ps=1.56e+06u
-M1022 Q a_2447_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_369# a_349_21# a_201_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_119_47# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1025 a_1177_47# a_877_369# a_1075_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1026 VGND a_1745_329# a_2447_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1027 a_877_369# a_693_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1028 a_1663_329# a_1075_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=1.932e+11p pd=2.14e+06u as=0p ps=0u
-M1029 VPWR a_1745_329# a_2447_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1030 a_1075_413# a_693_369# a_201_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1031 a_1745_329# a_693_369# a_1663_329# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_295_47# D a_201_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND a_2447_47# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1034 a_201_47# SCE a_119_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 Q a_2447_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_211_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.472e+11p pd=1.74e+06u as=0p ps=0u
-M1037 a_201_47# D a_211_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1169_413# a_693_369# a_1075_413# VPB phighvt w=420000u l=180000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1039 VPWR a_1229_21# a_1169_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VPWR CLK a_693_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1041 a_1745_329# a_877_369# a_1654_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1663_329# a_693_369# a_1745_329# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X1 VGND a_693_369# a_877_369# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_27_369# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X3 a_119_47# SCE a_201_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR a_1075_413# a_1663_329# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X5 a_1075_413# a_877_369# a_1177_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_2067_47# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_2447_47# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 a_201_47# a_349_21# a_27_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X9 a_2447_47# a_1745_329# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_211_369# D a_201_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X11 a_349_21# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X12 a_1075_413# a_693_369# a_1169_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X13 a_693_369# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VGND a_1745_329# a_1951_295# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_201_47# a_877_369# a_1075_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X16 a_349_21# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1229_21# a_1075_413# a_1467_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1169_413# a_1229_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X19 a_201_47# a_693_369# a_1075_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 Q a_2447_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR SCE a_211_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X22 a_1745_329# a_877_369# a_1891_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X23 VPWR a_1745_329# a_1951_295# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X24 VGND SCD a_119_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VPWR a_2447_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 VPWR a_693_369# a_877_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X27 VPWR a_1075_413# a_1229_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X28 a_295_47# a_349_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_1177_47# a_1229_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_1654_47# a_877_369# a_1745_329# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X31 a_1891_413# a_1951_295# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X32 a_693_369# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X33 a_201_47# D a_295_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_1229_21# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X35 a_1745_329# a_693_369# a_1995_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 VGND a_1075_413# a_1654_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X37 a_1467_47# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 Q a_2447_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X39 VPWR SET_B a_1745_329# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X40 a_1995_47# a_1951_295# a_2067_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X41 a_2447_47# a_1745_329# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
 .ends
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.cdl b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.cdl
index 82bbdf5..8938e04 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.cdl
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.cdl
@@ -16,84 +16,84 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdfstp_4 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI645 sceb SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB 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
-MI47 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI645 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net165 S0 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
-MI660 Q net165 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B 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
-MI662 net109 M1 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
-MI664 M0 clkneg 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
-MI6 net96 S1 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
-MI669 S0 clkpos 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
-MI24 S0 SET_B 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
-MI648 S1 S0 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
-MI38 S0 clkneg VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net84 M0 VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB 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
-MI45 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 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.18 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.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net157 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI663 net165 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MI660 Q net165 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net109 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net96 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net84 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-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.18 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.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net157 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net165 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + 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_hdll__sdfstp_4
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.netlist.tsv b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.netlist.tsv
index 835cc8b..e603b7f 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.netlist.tsv
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net165	S0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net165	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net109	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net109	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net96	S1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net96	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net84	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net84	M0	VPWR	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.18	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.65	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.65	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net165	S0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net165	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.65	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.65	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_hdll__sdfstp_4.spice b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.spice
index cf9a9bb..3a641c6 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.spice
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.spice
@@ -16,96 +16,50 @@
 
 
 .subckt sky130_fd_sc_hdll__sdfstp_4 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
-M1000 VPWR SET_B a_1229_21# VPB phighvt w=420000u l=180000u
-+  ad=2.3974e+12p pd=2.127e+07u as=1.722e+11p ps=1.66e+06u
-M1001 VGND a_349_21# a_295_47# VNB nshort w=420000u l=150000u
-+  ad=1.73245e+12p pd=1.7e+07u as=1.134e+11p ps=1.38e+06u
-M1002 a_2067_47# a_1951_295# a_1995_47# VNB nshort w=420000u l=150000u
-+  ad=2.016e+11p pd=1.8e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_1745_329# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=4.746e+11p pd=4.26e+06u as=0p ps=0u
-M1004 a_1951_295# a_1745_329# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1005 a_1995_47# a_693_369# a_1745_329# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.332e+11p ps=2.5e+06u
-M1006 a_1891_413# a_877_369# a_1745_329# VPB phighvt w=420000u l=180000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1007 VGND SCE a_349_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1008 a_1075_413# a_877_369# a_201_47# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.99e+11p ps=3.24e+06u
-M1009 VGND a_2447_47# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1010 VPWR SCD a_27_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=3.456e+11p ps=3.64e+06u
-M1011 a_1229_21# a_1075_413# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Q a_2447_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1013 Q a_2447_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR SCE a_349_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1015 VGND SET_B a_2067_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_2447_47# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND SET_B a_1467_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1018 a_877_369# a_693_369# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1019 VGND a_1229_21# a_1177_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1020 VPWR a_1951_295# a_1891_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND CLK a_693_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1022 a_1951_295# a_1745_329# VGND VNB nshort w=420000u l=150000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1023 a_1654_47# a_1075_413# VGND VNB nshort w=640000u l=150000u
-+  ad=5.088e+11p pd=2.87e+06u as=0p ps=0u
-M1024 a_1467_47# a_1075_413# a_1229_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.512e+11p ps=1.56e+06u
-M1025 Q a_2447_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_369# a_349_21# a_201_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_119_47# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1028 a_1177_47# a_877_369# a_1075_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1029 VPWR a_2447_47# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND a_1745_329# a_2447_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1031 a_877_369# a_693_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1032 a_1663_329# a_1075_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=1.932e+11p pd=2.14e+06u as=0p ps=0u
-M1033 a_1075_413# a_693_369# a_201_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1034 a_1745_329# a_693_369# a_1663_329# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_295_47# D a_201_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND a_2447_47# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_201_47# SCE a_119_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Q a_2447_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_211_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.472e+11p pd=1.74e+06u as=0p ps=0u
-M1040 VPWR a_1745_329# a_2447_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1041 a_201_47# D a_211_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_1169_413# a_693_369# a_1075_413# VPB phighvt w=420000u l=180000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1043 VPWR a_1229_21# a_1169_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VPWR CLK a_693_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1045 a_1745_329# a_877_369# a_1654_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1663_329# a_693_369# a_1745_329# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X1 VGND a_693_369# a_877_369# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_27_369# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X3 a_119_47# SCE a_201_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 Q a_2447_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_2447_47# a_1745_329# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND a_2447_47# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VPWR a_1075_413# a_1663_329# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X8 a_1075_413# a_877_369# a_1177_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_2067_47# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND a_2447_47# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_201_47# a_349_21# a_27_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X12 a_2447_47# a_1745_329# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_211_369# D a_201_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X14 a_349_21# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X15 a_1075_413# a_693_369# a_1169_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X16 a_693_369# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_1745_329# a_1951_295# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_201_47# a_877_369# a_1075_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X19 a_349_21# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_1229_21# a_1075_413# a_1467_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_1169_413# a_1229_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X22 a_201_47# a_693_369# a_1075_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 Q a_2447_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 VPWR SCE a_211_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X25 a_1745_329# a_877_369# a_1891_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X26 VPWR a_1745_329# a_1951_295# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X27 VGND SCD a_119_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VPWR a_2447_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 VPWR a_693_369# a_877_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X30 VPWR a_1075_413# a_1229_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X31 a_295_47# a_349_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_1177_47# a_1229_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_1654_47# a_877_369# a_1745_329# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X34 a_1891_413# a_1951_295# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X35 a_693_369# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X36 a_201_47# D a_295_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_1229_21# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X38 a_1745_329# a_693_369# a_1995_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 VGND a_1075_413# a_1654_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X40 Q a_2447_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X41 a_1467_47# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X42 Q a_2447_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X43 VPWR SET_B a_1745_329# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X44 a_1995_47# a_1951_295# a_2067_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X45 VPWR a_2447_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.cdl b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.cdl
index 9faae4b..036069f 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.cdl
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.cdl
@@ -16,76 +16,76 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdfxbp_1 CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI657 M0 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net132 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net120 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nshort m=1 w=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
-MI652 M1 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N net153 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net153 S1 VNB nshort m=1 w=0.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.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=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
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI656 net132 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB phighvt m=1 w=1.0 l=0.18 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.18 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.75 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net189 M1 VPB 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
-MI645 Q S1 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
-MI660 Q_N net153 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
-MI643 net177 S1 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
-MI651 db clkpos 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
-MI653 M1 clkneg 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
-MI640 sceb SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB 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
-MI638 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI641 net120 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 net153 S1 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N net153 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net153 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 S1 S0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net189 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q_N net153 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net177 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 net153 S1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfxbp_1
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.netlist.tsv b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.netlist.tsv
index 429a891..5704e73 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.netlist.tsv
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_hdll__sdfxbp_1	CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI657	MOSFET	M0	clkpos	net132	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net132	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net120	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net120	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.36	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
-MI639	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net153	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net153	S1	VGND	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.65	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
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net177	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.75	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net189	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	net153	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net177	S1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net189	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	net153	S1	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI657	MOSFET	M0	clkpos	net132	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net132	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net120	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net120	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.36	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
+MI639	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net153	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net153	S1	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	VGND	VNB	nfet_01v8	1	0.65	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
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net177	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.75	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net189	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q_N	net153	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net177	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net189	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	net153	S1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.spice b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.spice
index f08ba6f..dfb1501 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.spice
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_hdll__sdfxbp_1 CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 VPWR a_1179_183# a_1111_413# VPB phighvt w=420000u l=180000u
-+  ad=1.70555e+12p pd=1.505e+07u as=1.47e+11p ps=1.54e+06u
-M1001 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.3638e+12p ps=1.273e+07u
-M1002 Q a_1653_315# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1003 a_1179_183# a_1001_47# VGND VNB nshort w=640000u l=150000u
-+  ad=1.978e+11p pd=1.99e+06u as=0p ps=0u
-M1004 VPWR SCD a_698_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=2.144e+11p ps=1.95e+06u
-M1005 a_1464_413# a_27_47# a_1179_183# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.307e+11p ps=2.19e+06u
-M1006 a_1001_47# a_27_47# a_604_369# VNB nshort w=360000u l=150000u
-+  ad=1.548e+11p pd=1.58e+06u as=2.604e+11p ps=2.88e+06u
-M1007 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1008 VPWR a_1653_315# a_2114_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1009 a_698_369# a_319_47# a_604_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=2.99e+11p ps=3.24e+06u
-M1010 a_604_369# D a_529_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1011 VGND a_1653_315# a_2114_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1012 VPWR a_1464_413# a_1653_315# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1013 a_503_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.08e+11p pd=1.93e+06u as=0p ps=0u
-M1014 VGND a_1179_183# a_1117_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.374e+11p ps=1.52e+06u
-M1015 a_717_47# SCE a_604_369# VNB nshort w=420000u l=150000u
-+  ad=9.66e+10p pd=1.3e+06u as=0p ps=0u
-M1016 a_604_369# D a_503_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND SCE a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1018 VPWR SCE a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1019 a_1111_413# a_27_47# a_1001_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.407e+11p ps=1.51e+06u
-M1020 VGND a_1653_315# a_1615_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.446e+11p ps=1.55e+06u
-M1021 a_1179_183# a_1001_47# VPWR VPB phighvt w=750000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1001_47# a_211_363# a_604_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1024 a_1464_413# a_211_363# a_1179_183# VNB nshort w=360000u l=150000u
-+  ad=1.854e+11p pd=1.75e+06u as=0p ps=0u
-M1025 a_529_47# a_319_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_1653_315# a_1558_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.037e+11p ps=1.81e+06u
-M1027 Q_N a_2114_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1028 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1029 a_1117_47# a_211_363# a_1001_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Q_N a_2114_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1031 a_1558_413# a_211_363# a_1464_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Q a_1653_315# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1033 VGND SCD a_717_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1615_47# a_27_47# a_1464_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_1464_413# a_1653_315# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
+X0 a_1117_47# a_1179_183# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_2114_47# a_1653_315# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X2 VPWR a_1001_47# a_1179_183# VPB sky130_fd_pr__pfet_01v8_hvt w=750000u l=180000u
+X3 VPWR a_2114_47# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_1653_315# a_1464_413# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_1111_413# a_1179_183# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 a_1558_413# a_1653_315# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 VGND a_1001_47# a_1179_183# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_1615_47# a_1653_315# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X10 a_698_369# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X11 a_2114_47# a_1653_315# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_604_369# a_211_363# a_1001_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X13 a_1001_47# a_27_47# a_1111_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X14 a_319_47# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VPWR a_1653_315# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VGND a_27_47# a_211_363# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_319_47# a_529_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1653_315# a_1464_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_1464_413# a_211_363# a_1558_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X20 a_1179_183# a_27_47# a_1464_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X21 a_604_369# SCE a_717_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_604_369# a_27_47# a_1001_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X23 a_1179_183# a_211_363# a_1464_413# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X24 VGND a_2114_47# Q_N VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 VPWR SCE a_503_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X26 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_529_47# D a_604_369# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VPWR a_27_47# a_211_363# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X29 VGND a_1653_315# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 a_717_47# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_1464_413# a_27_47# a_1615_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X32 a_604_369# a_319_47# a_698_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X33 a_1001_47# a_211_363# a_1117_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X34 a_503_369# D a_604_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X35 a_319_47# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
 .ends
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.cdl b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.cdl
index f228601..9c79c09 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.cdl
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.cdl
@@ -16,76 +16,76 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdfxbp_2 CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI657 M0 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net129 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net120 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nshort m=1 w=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
-MI652 M1 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N net153 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net153 S1 VNB nshort m=1 w=0.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.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=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
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI656 net129 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB phighvt m=1 w=1.0 l=0.18 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.18 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.75 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net189 M1 VPB 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
-MI645 Q S1 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q_N net153 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net177 S1 VPB 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
-MI651 db clkpos 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
-MI653 M1 clkneg 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
-MI640 sceb SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB 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
-MI638 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI641 net120 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 net153 S1 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N net153 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net153 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 S1 S0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net189 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q_N net153 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net177 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 net153 S1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfxbp_2
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.netlist.tsv b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.netlist.tsv
index e74272a..beef156 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.netlist.tsv
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_hdll__sdfxbp_2	CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI657	MOSFET	M0	clkpos	net129	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net129	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net120	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net120	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.36	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
-MI639	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net153	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net153	S1	VGND	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.65	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
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net177	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.75	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net189	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	net153	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net177	S1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net189	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	net153	S1	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI657	MOSFET	M0	clkpos	net129	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net129	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net120	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net120	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.36	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
+MI639	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net153	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net153	S1	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	VGND	VNB	nfet_01v8	1	0.65	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
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net177	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.75	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net189	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q_N	net153	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net177	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net189	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	net153	S1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.spice b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.spice
index 59d566c..a53e058 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.spice
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_hdll__sdfxbp_2 CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 VPWR a_1179_183# a_1111_413# VPB phighvt w=420000u l=180000u
-+  ad=2.67555e+12p pd=2.099e+07u as=1.47e+11p ps=1.54e+06u
-M1001 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.9813e+12p ps=1.723e+07u
-M1002 a_1179_183# a_1001_47# VGND VNB nshort w=640000u l=150000u
-+  ad=1.978e+11p pd=1.99e+06u as=0p ps=0u
-M1003 VPWR a_1653_315# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1004 VGND a_2234_47# Q_N VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1005 VPWR a_2234_47# Q_N VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1006 Q_N a_2234_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR SCD a_698_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=2.144e+11p ps=1.95e+06u
-M1008 a_1464_413# a_27_47# a_1179_183# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.307e+11p ps=2.19e+06u
-M1009 a_1001_47# a_27_47# a_604_369# VNB nshort w=360000u l=150000u
-+  ad=1.548e+11p pd=1.58e+06u as=2.604e+11p ps=2.88e+06u
-M1010 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1011 a_698_369# a_319_47# a_604_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=2.99e+11p ps=3.24e+06u
-M1012 Q_N a_2234_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Q a_1653_315# VGND VNB nshort w=650000u l=150000u
-+  ad=2.08e+11p pd=1.94e+06u as=0p ps=0u
-M1014 a_604_369# D a_529_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1015 VPWR a_1464_413# a_1653_315# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1016 a_503_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.08e+11p pd=1.93e+06u as=0p ps=0u
-M1017 VGND a_1179_183# a_1117_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.374e+11p ps=1.52e+06u
-M1018 VPWR a_1653_315# a_2234_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1019 a_717_47# SCE a_604_369# VNB nshort w=420000u l=150000u
-+  ad=9.66e+10p pd=1.3e+06u as=0p ps=0u
-M1020 a_604_369# D a_503_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND SCE a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1022 VPWR SCE a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1023 a_1111_413# a_27_47# a_1001_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.407e+11p ps=1.51e+06u
-M1024 VGND a_1653_315# a_1615_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.446e+11p ps=1.55e+06u
-M1025 a_1179_183# a_1001_47# VPWR VPB phighvt w=750000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Q a_1653_315# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_1653_315# a_2234_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1028 a_1001_47# a_211_363# a_604_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1030 a_1464_413# a_211_363# a_1179_183# VNB nshort w=360000u l=150000u
-+  ad=1.854e+11p pd=1.75e+06u as=0p ps=0u
-M1031 a_529_47# a_319_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR a_1653_315# a_1558_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.037e+11p ps=1.81e+06u
-M1033 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1034 a_1117_47# a_211_363# a_1001_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_1653_315# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1558_413# a_211_363# a_1464_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND SCD a_717_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1615_47# a_27_47# a_1464_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND a_1464_413# a_1653_315# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
+X0 a_1117_47# a_1179_183# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR a_1653_315# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VPWR a_1001_47# a_1179_183# VPB sky130_fd_pr__pfet_01v8_hvt w=750000u l=180000u
+X3 a_1653_315# a_1464_413# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 a_1111_413# a_1179_183# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 a_1558_413# a_1653_315# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 Q a_1653_315# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND a_1001_47# a_1179_183# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_1615_47# a_1653_315# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X10 a_698_369# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X11 a_604_369# a_211_363# a_1001_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X12 VGND a_2234_47# Q_N VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 a_1001_47# a_27_47# a_1111_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X14 a_319_47# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VGND a_27_47# a_211_363# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VGND a_319_47# a_529_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1653_315# a_1464_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 a_1464_413# a_211_363# a_1558_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X19 a_2234_47# a_1653_315# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_1179_183# a_27_47# a_1464_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X21 a_604_369# SCE a_717_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_604_369# a_27_47# a_1001_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X23 a_1179_183# a_211_363# a_1464_413# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X24 Q a_1653_315# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 VPWR SCE a_503_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X26 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_529_47# D a_604_369# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 Q_N a_2234_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 VPWR a_27_47# a_211_363# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X30 a_717_47# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_1464_413# a_27_47# a_1615_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X32 a_604_369# a_319_47# a_698_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X33 a_1001_47# a_211_363# a_1117_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X34 a_2234_47# a_1653_315# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X35 a_503_369# D a_604_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X36 Q_N a_2234_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X37 a_319_47# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X38 VPWR a_2234_47# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X39 VGND a_1653_315# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.cdl b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.cdl
index 7f43d70..05dc762 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.cdl
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdfxtp_1 CLK D SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI652 M1 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB 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.65 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.36 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 net75 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net54 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 net122 S1 VPB phighvt m=1 w=0.42 l=0.18 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.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net155 M1 VPB phighvt m=1 w=0.42 l=0.18 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB 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
-MI653 M1 clkneg 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
-MI659 M0 clkneg 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
-MI638 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 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.18 mult=1 sa=0.265
+MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net75 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net54 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 net122 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net155 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M1 M0 VPB phighvt m=1 w=0.75 l=0.18 mult=1 sa=0.265 sb=0.265
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfxtp_1
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.netlist.tsv b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.netlist.tsv
index 5e47771..70af809 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.netlist.tsv
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_hdll__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.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.65	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	net75	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net75	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net54	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.36	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	net54	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	net122	S1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net155	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net155	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net122	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.75	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.65	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	net75	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net75	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net54	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.36	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	net54	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	net122	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net155	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net155	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net122	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.75	0.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.spice b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.spice
index 45fbb83..287f33b 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.spice
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hdll__sdfxtp_1 CLK D SCD SCE VGND VNB VPB VPWR Q
-M1000 VPWR a_1189_21# a_1121_413# VPB phighvt w=420000u l=180000u
-+  ad=1.3699e+12p pd=1.231e+07u as=1.47e+11p ps=1.54e+06u
-M1001 VGND a_1474_413# a_1647_21# VNB nshort w=650000u l=150000u
-+  ad=1.0782e+12p pd=1.048e+07u as=2.015e+11p ps=1.92e+06u
-M1002 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1003 a_608_369# D a_507_47# VNB nshort w=420000u l=150000u
-+  ad=2.604e+11p pd=2.88e+06u as=1.638e+11p ps=1.62e+06u
-M1004 a_1474_413# a_27_47# a_1189_21# VPB phighvt w=420000u l=180000u
-+  ad=1.26e+11p pd=1.44e+06u as=2.4195e+11p ps=2.22e+06u
-M1005 VGND a_1189_21# a_1117_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.446e+11p ps=1.56e+06u
-M1006 a_504_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.176e+11p pd=1.96e+06u as=0p ps=0u
-M1007 a_203_47# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1008 VGND a_1647_21# a_1581_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.338e+11p ps=1.5e+06u
-M1009 VPWR SCE a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1010 VPWR a_1647_21# a_1570_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.659e+11p ps=1.63e+06u
-M1011 a_1121_413# a_27_47# a_1011_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.407e+11p ps=1.51e+06u
-M1012 a_1189_21# a_1011_47# VGND VNB nshort w=640000u l=150000u
-+  ad=2.104e+11p pd=2.06e+06u as=0p ps=0u
-M1013 VGND SCE a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.428e+11p ps=1.52e+06u
-M1014 a_1011_47# a_203_47# a_608_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=3.2e+11p ps=3.34e+06u
-M1015 a_1570_413# a_203_47# a_1474_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Q a_1647_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1017 a_203_47# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1018 a_1474_413# a_203_47# a_1189_21# VNB nshort w=360000u l=150000u
-+  ad=1.35e+11p pd=1.47e+06u as=0p ps=0u
-M1019 VPWR SCD a_702_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=2.144e+11p ps=1.95e+06u
-M1020 VGND SCD a_721_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=9.66e+10p ps=1.3e+06u
-M1021 a_507_47# a_319_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_702_369# a_319_47# a_608_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1117_47# a_203_47# a_1011_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.368e+11p ps=1.48e+06u
-M1024 VPWR a_1474_413# a_1647_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1025 a_1189_21# a_1011_47# VPWR VPB phighvt w=750000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1011_47# a_27_47# a_608_369# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1581_47# a_27_47# a_1474_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1029 a_721_47# SCE a_608_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_608_369# D a_504_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Q a_1647_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
+X0 a_1011_47# a_27_47# a_1121_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 a_1647_21# a_1474_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_1647_21# a_1474_413# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_608_369# SCE a_721_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X5 a_1189_21# a_27_47# a_1474_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X6 a_1474_413# a_203_47# a_1570_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 a_608_369# a_27_47# a_1011_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X8 a_504_369# D a_608_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X9 a_702_369# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X10 VGND a_319_47# a_507_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_507_47# D a_608_369# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND a_1011_47# a_1189_21# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_1474_413# a_27_47# a_1581_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X14 a_319_47# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VGND a_27_47# a_203_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_1570_413# a_1647_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X17 a_1189_21# a_203_47# a_1474_413# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X18 a_721_47# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_1581_47# a_1647_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR SCE a_504_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X21 VPWR a_1011_47# a_1189_21# VPB sky130_fd_pr__pfet_01v8_hvt w=750000u l=180000u
+X22 VGND a_1647_21# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VPWR a_1647_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 VPWR a_27_47# a_203_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X25 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_1011_47# a_203_47# a_1117_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X27 a_1121_413# a_1189_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X28 a_1117_47# a_1189_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_319_47# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X30 a_608_369# a_319_47# a_702_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X31 a_608_369# a_203_47# a_1011_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.cdl b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.cdl
index d3a7ae4..958a214 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.cdl
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdfxtp_2 CLK D SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI652 M1 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB 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.65 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.36 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 net75 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net54 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 net122 S1 VPB phighvt m=1 w=0.42 l=0.18 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.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net138 M1 VPB phighvt m=1 w=0.42 l=0.18 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB 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
-MI653 M1 clkneg 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
-MI659 M0 clkneg 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
-MI638 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 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.18 mult=1 sa=0.265
+MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net75 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net54 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 net122 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net138 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M1 M0 VPB phighvt m=1 w=0.75 l=0.18 mult=1 sa=0.265 sb=0.265
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfxtp_2
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.netlist.tsv b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.netlist.tsv
index 13cc4a8..712617f 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.netlist.tsv
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_hdll__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.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.65	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	net75	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net75	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net54	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.36	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	net54	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	net122	S1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net138	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net138	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net122	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.75	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.65	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	net75	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net75	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net54	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.36	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	net54	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	net122	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net138	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net138	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net122	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.75	0.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.spice b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.spice
index c5fe7a4..6327625 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.spice
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_hdll__sdfxtp_2 CLK D SCD SCE VGND VNB VPB VPWR Q
-M1000 VPWR a_1189_183# a_1121_413# VPB phighvt w=420000u l=180000u
-+  ad=1.71115e+12p pd=1.5e+07u as=1.47e+11p ps=1.54e+06u
-M1001 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1002 a_608_369# D a_517_47# VNB nshort w=420000u l=150000u
-+  ad=2.604e+11p pd=2.88e+06u as=1.428e+11p ps=1.52e+06u
-M1003 a_1474_413# a_27_47# a_1189_183# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.307e+11p ps=2.19e+06u
-M1004 VPWR a_1667_315# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1005 VGND a_1667_315# Q VNB nshort w=650000u l=150000u
-+  ad=1.30535e+12p pd=1.249e+07u as=2.405e+11p ps=2.04e+06u
-M1006 VGND a_1667_315# a_1625_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.32e+11p ps=1.49e+06u
-M1007 VGND a_1189_183# a_1127_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.584e+11p ps=1.62e+06u
-M1008 a_504_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.176e+11p pd=1.96e+06u as=0p ps=0u
-M1009 a_203_47# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1010 VPWR a_1667_315# a_1568_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.121e+11p ps=1.85e+06u
-M1011 VPWR SCE a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1012 a_1121_413# a_27_47# a_1011_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.407e+11p ps=1.51e+06u
-M1013 a_1474_413# a_203_47# a_1189_183# VNB nshort w=360000u l=150000u
-+  ad=1.854e+11p pd=1.75e+06u as=1.978e+11p ps=1.99e+06u
-M1014 VGND SCE a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1015 Q a_1667_315# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_1474_413# a_1667_315# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1017 a_517_47# a_319_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1127_47# a_203_47# a_1011_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.548e+11p ps=1.58e+06u
-M1019 a_1189_183# a_1011_47# VPWR VPB phighvt w=750000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Q a_1667_315# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1011_47# a_203_47# a_608_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=3.2e+11p ps=3.34e+06u
-M1022 a_203_47# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1023 a_1625_47# a_27_47# a_1474_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR SCD a_702_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=2.144e+11p ps=1.95e+06u
-M1025 VGND SCD a_721_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=9.66e+10p ps=1.3e+06u
-M1026 VPWR a_1474_413# a_1667_315# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1027 a_702_369# a_319_47# a_608_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1189_183# a_1011_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1568_413# a_203_47# a_1474_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1011_47# a_27_47# a_608_369# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1032 a_721_47# SCE a_608_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_608_369# D a_504_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1011_47# a_27_47# a_1121_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 a_1568_413# a_1667_315# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 a_608_369# SCE a_721_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND a_319_47# a_517_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_1474_413# a_203_47# a_1568_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X6 a_1127_47# a_1189_183# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_1189_183# a_27_47# a_1474_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X8 VPWR a_1667_315# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_319_47# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 Q a_1667_315# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_608_369# a_27_47# a_1011_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X12 a_1189_183# a_203_47# a_1474_413# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X13 VGND a_1667_315# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_504_369# D a_608_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X15 a_702_369# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X16 a_517_47# D a_608_369# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_27_47# a_203_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_721_47# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_1474_413# a_27_47# a_1625_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X20 a_1011_47# a_203_47# a_1127_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X21 VPWR SCE a_504_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X22 a_1667_315# a_1474_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 a_1625_47# a_1667_315# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_1667_315# a_1474_413# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 VPWR a_27_47# a_203_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X26 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 Q a_1667_315# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 VPWR a_1011_47# a_1189_183# VPB sky130_fd_pr__pfet_01v8_hvt w=750000u l=180000u
+X29 a_1121_413# a_1189_183# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X30 VGND a_1011_47# a_1189_183# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X31 a_319_47# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X32 a_608_369# a_319_47# a_702_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X33 a_608_369# a_203_47# a_1011_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.cdl b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.cdl
index 26ea694..a08fafd 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.cdl
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdfxtp_4 CLK D SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI652 M1 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB 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.65 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.36 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 net78 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net54 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 net122 S1 VPB phighvt m=1 w=0.42 l=0.18 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.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net138 M1 VPB phighvt m=1 w=0.42 l=0.18 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB 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
-MI653 M1 clkneg 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
-MI659 M0 clkneg 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
-MI638 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 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.18 mult=1 sa=0.265
+MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net78 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net54 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 net122 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net138 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M1 M0 VPB phighvt m=1 w=0.75 l=0.18 mult=1 sa=0.265 sb=0.265
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfxtp_4
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.netlist.tsv b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.netlist.tsv
index c60be46..9884c9f 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.netlist.tsv
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_hdll__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.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.65	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	net78	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net78	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net54	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.36	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	net54	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	net122	S1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net138	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net138	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net122	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.75	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.65	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	net78	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net78	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net54	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.36	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	net54	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	net122	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net138	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net138	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net122	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.75	0.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.spice b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.spice
index ddd0437..b9b4e43 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.spice
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_hdll__sdfxtp_4 CLK D SCD SCE VGND VNB VPB VPWR Q
-M1000 VPWR a_1189_183# a_1121_413# VPB phighvt w=420000u l=180000u
-+  ad=1.98115e+12p pd=1.754e+07u as=1.47e+11p ps=1.54e+06u
-M1001 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1002 a_608_369# D a_517_47# VNB nshort w=420000u l=150000u
-+  ad=2.604e+11p pd=2.88e+06u as=1.428e+11p ps=1.52e+06u
-M1003 a_1474_413# a_27_47# a_1189_183# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.307e+11p ps=2.19e+06u
-M1004 VPWR a_1667_315# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1005 VGND a_1667_315# a_1625_47# VNB nshort w=420000u l=150000u
-+  ad=1.48085e+12p pd=1.433e+07u as=1.32e+11p ps=1.49e+06u
-M1006 VGND a_1667_315# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.485e+11p ps=3.98e+06u
-M1007 VGND a_1189_183# a_1127_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.584e+11p ps=1.62e+06u
-M1008 a_504_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.176e+11p pd=1.96e+06u as=0p ps=0u
-M1009 a_203_47# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1010 VPWR a_1667_315# a_1568_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.121e+11p ps=1.85e+06u
-M1011 VGND a_1667_315# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR SCE a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1013 a_1121_413# a_27_47# a_1011_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.407e+11p ps=1.51e+06u
-M1014 a_1474_413# a_203_47# a_1189_183# VNB nshort w=360000u l=150000u
-+  ad=1.854e+11p pd=1.75e+06u as=1.978e+11p ps=1.99e+06u
-M1015 Q a_1667_315# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND SCE a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1017 Q a_1667_315# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_1667_315# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_1474_413# a_1667_315# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1020 a_517_47# a_319_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1127_47# a_203_47# a_1011_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.548e+11p ps=1.58e+06u
-M1022 a_1189_183# a_1011_47# VPWR VPB phighvt w=750000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Q a_1667_315# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1011_47# a_203_47# a_608_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=3.2e+11p ps=3.34e+06u
-M1025 Q a_1667_315# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_203_47# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1027 a_1625_47# a_27_47# a_1474_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR SCD a_702_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=2.144e+11p ps=1.95e+06u
-M1029 VGND SCD a_721_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=9.66e+10p ps=1.3e+06u
-M1030 VPWR a_1474_413# a_1667_315# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1031 a_702_369# a_319_47# a_608_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1189_183# a_1011_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1568_413# a_203_47# a_1474_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1011_47# a_27_47# a_608_369# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1036 a_721_47# SCE a_608_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_608_369# D a_504_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1011_47# a_27_47# a_1121_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X1 a_1568_413# a_1667_315# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 a_608_369# SCE a_721_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND a_319_47# a_517_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_1474_413# a_203_47# a_1568_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X5 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X6 a_1127_47# a_1189_183# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_1189_183# a_27_47# a_1474_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X8 VPWR a_1667_315# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_319_47# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_608_369# a_27_47# a_1011_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X11 a_1189_183# a_203_47# a_1474_413# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X12 VGND a_1667_315# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VGND a_1667_315# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_504_369# D a_608_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X15 a_702_369# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X16 a_517_47# D a_608_369# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 Q a_1667_315# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 Q a_1667_315# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 VGND a_27_47# a_203_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_721_47# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_1474_413# a_27_47# a_1625_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X22 a_1011_47# a_203_47# a_1127_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X23 VPWR SCE a_504_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X24 a_1667_315# a_1474_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 a_1625_47# a_1667_315# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_1667_315# a_1474_413# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 VPWR a_27_47# a_203_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X28 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 Q a_1667_315# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X30 VPWR a_1667_315# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X31 Q a_1667_315# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X32 VPWR a_1011_47# a_1189_183# VPB sky130_fd_pr__pfet_01v8_hvt w=750000u l=180000u
+X33 a_1121_413# a_1189_183# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X34 VGND a_1011_47# a_1189_183# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X35 a_319_47# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X36 a_608_369# a_319_47# a_702_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X37 a_608_369# a_203_47# a_1011_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.cdl b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.cdl
index 3bda9ee..2b3a7d1 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.cdl
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdlclkp_1 CLK GATE SCE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I SCE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net88 m1 VPB 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
-MI664 M0 clkpos 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
-MI659 net76 CLK VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net76 m1 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 m1 M0 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
-MI22 net68 SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 net116 GATE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI662 net88 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI664 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 GCLK net76 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
-MI43 net116 clkneg VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI659 net76 CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net116 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI658 net76 m1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MI19 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net123 m1 VNB nshort m=1 w=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.18 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.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 GCLK net76 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net116 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net116 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 GCLK net76 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net123 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 net116 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net112 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net76 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net116 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net76 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdlclkp_1
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.netlist.tsv b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.netlist.tsv
index 5c24e96..effd8a1 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.netlist.tsv
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkpos	net88	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net76	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net76	m1	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net68	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net116	GATE	net68	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net76	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net116	clkneg	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net116	clkpos	M0	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkneg	net123	VNB	nshort	1	0.36	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.65	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	GCLK	net76	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net116	clkpos	M0	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkneg	net123	VNB	nfet_01v8	1	0.36	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.spice b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.spice
index 0dbe563..812c5f6 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.spice
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_hdll__sdlclkp_1 CLK GATE SCE VGND VNB VPB VPWR GCLK
-M1000 a_484_315# a_299_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=1.3826e+12p ps=1.216e+07u
-M1001 a_1089_47# a_484_315# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.92e+11p pd=1.88e+06u as=0p ps=0u
-M1002 a_269_21# CLK VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1003 a_27_47# GATE a_117_369# VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=1.472e+11p ps=1.74e+06u
-M1004 a_484_315# a_299_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=7.9265e+11p ps=7.37e+06u
-M1005 a_117_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_415_47# a_266_243# a_299_47# VNB nshort w=360000u l=150000u
-+  ad=1.968e+11p pd=1.85e+06u as=1.548e+11p ps=1.58e+06u
-M1007 a_269_21# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1008 a_1181_47# a_484_315# a_1089_47# VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=1.302e+11p ps=1.46e+06u
-M1009 a_410_413# a_269_21# a_299_47# VPB phighvt w=420000u l=180000u
-+  ad=1.596e+11p pd=1.6e+06u as=1.47e+11p ps=1.54e+06u
-M1010 VPWR a_484_315# a_410_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_484_315# a_415_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 GCLK a_1089_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1013 VGND CLK a_1181_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_299_47# a_269_21# a_27_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=2.622e+11p ps=2.95e+06u
-M1015 VGND SCE a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR CLK a_1089_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_299_47# a_266_243# a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 GCLK a_1089_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.8525e+11p pd=1.87e+06u as=0p ps=0u
-M1019 VGND a_269_21# a_266_243# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1020 VPWR a_269_21# a_266_243# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1021 a_27_47# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR SCE a_117_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X1 a_410_413# a_484_315# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 VGND a_299_47# a_484_315# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_299_47# a_266_243# a_415_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X4 VPWR a_299_47# a_484_315# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VPWR a_484_315# a_1089_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X6 a_27_47# a_266_243# a_299_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 VPWR CLK a_269_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X8 a_266_243# a_269_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND GATE a_27_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_266_243# a_269_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X11 a_415_47# a_484_315# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND CLK a_269_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_27_47# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_27_47# a_269_21# a_299_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X15 a_117_369# GATE a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X16 a_1089_47# a_484_315# a_1181_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VPWR a_1089_47# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VGND a_1089_47# GCLK VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 a_1089_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X20 a_1181_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_299_47# a_269_21# a_410_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.cdl b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.cdl
index b70f67e..99d3ef8 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.cdl
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdlclkp_2 CLK GATE SCE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I SCE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net88 m1 VPB 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
-MI664 M0 clkpos 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
-MI659 net76 CLK VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net76 m1 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 m1 M0 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
-MI22 net63 SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 net116 GATE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI662 net88 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI664 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 GCLK net76 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net116 clkneg VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI659 net76 CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net116 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI658 net76 m1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MI19 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net123 m1 VNB nshort m=1 w=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.18 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.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 GCLK net76 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net116 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net116 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 GCLK net76 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net123 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 net116 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net112 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net76 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net116 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net76 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdlclkp_2
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.netlist.tsv b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.netlist.tsv
index 50ae1b9..c59be89 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.netlist.tsv
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkpos	net88	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net76	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net76	m1	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net63	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net116	GATE	net63	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net76	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net116	clkneg	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net116	clkpos	M0	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkneg	net123	VNB	nshort	1	0.36	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.65	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	GCLK	net76	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net116	clkpos	M0	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkneg	net123	VNB	nfet_01v8	1	0.36	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.spice b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.spice
index 621878f..375c420 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.spice
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__sdlclkp_2 CLK GATE SCE VGND VNB VPB VPWR GCLK
-M1000 a_484_315# a_299_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=1.6654e+12p ps=1.474e+07u
-M1001 a_269_21# CLK VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1002 a_27_47# GATE a_117_369# VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=1.472e+11p ps=1.74e+06u
-M1003 VPWR a_1093_47# GCLK VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1004 a_1185_47# a_484_315# a_1093_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.302e+11p ps=1.46e+06u
-M1005 VGND CLK a_1185_47# VNB nshort w=420000u l=150000u
-+  ad=9.4605e+11p pd=9.05e+06u as=0p ps=0u
-M1006 a_484_315# a_299_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1007 a_117_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_415_47# a_266_243# a_299_47# VNB nshort w=360000u l=150000u
-+  ad=1.977e+11p pd=1.85e+06u as=1.548e+11p ps=1.58e+06u
-M1009 a_410_413# a_269_21# a_299_47# VPB phighvt w=420000u l=180000u
-+  ad=1.596e+11p pd=1.6e+06u as=1.47e+11p ps=1.54e+06u
-M1010 VPWR a_484_315# a_410_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 GCLK a_1093_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_1093_47# GCLK VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1013 VPWR CLK a_1093_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.856e+11p ps=1.86e+06u
-M1014 GCLK a_1093_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_484_315# a_415_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_269_21# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1017 VGND a_269_21# a_266_243# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1018 a_299_47# a_269_21# a_27_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=2.622e+11p ps=2.95e+06u
-M1019 a_1093_47# a_484_315# VPWR VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND SCE a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_299_47# a_266_243# a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_269_21# a_266_243# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1023 a_27_47# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR SCE a_117_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X1 a_410_413# a_484_315# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 VGND a_299_47# a_484_315# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_299_47# a_266_243# a_415_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X4 VPWR a_299_47# a_484_315# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 GCLK a_1093_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 a_27_47# a_266_243# a_299_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 VPWR CLK a_269_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X8 VGND GATE a_27_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_1093_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X10 a_1185_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR a_484_315# a_1093_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X12 a_266_243# a_269_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X13 VGND a_1093_47# GCLK VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_415_47# a_484_315# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_27_47# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_27_47# a_269_21# a_299_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X17 a_1093_47# a_484_315# a_1185_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VGND CLK a_269_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_117_369# GATE a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X20 GCLK a_1093_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 VPWR a_1093_47# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 a_299_47# a_269_21# a_410_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X23 a_266_243# a_269_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.cdl b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.cdl
index b9a253f..70c8fe9 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.cdl
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdlclkp_4 CLK GATE SCE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I SCE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net88 m1 VPB 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
-MI664 M0 clkpos 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
-MI659 net76 CLK 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
-MI658 net76 m1 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
-MI19 m1 M0 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
-MI22 net63 SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 net116 GATE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI662 net88 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI664 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 GCLK net76 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net116 clkneg VPB phighvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI659 net76 CLK VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net116 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI658 net76 m1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 m1 M0 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MI19 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkneg VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net123 m1 VNB nshort m=1 w=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.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net76 m1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 net116 GATE VNB nshort m=1 w=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.18 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.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 GCLK net76 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net116 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net116 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 GCLK net76 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net123 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 net116 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net112 CLK VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net76 m1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net116 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net76 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdlclkp_4
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.netlist.tsv b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.netlist.tsv
index 05ec200..5e71e28 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.netlist.tsv
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_hdll__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.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkpos	net88	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net76	CLK	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net76	m1	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net63	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net116	GATE	net63	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net76	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net116	clkneg	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net116	clkpos	M0	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkneg	net123	VNB	nshort	1	0.36	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net76	m1	net112	VNB	nshort	1	0.65	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.65	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net76	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net76	m1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	GCLK	net76	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net116	clkpos	M0	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkneg	net123	VNB	nfet_01v8	1	0.36	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net76	m1	net112	VNB	nfet_01v8	1	0.65	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.spice b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.spice
index 00f6bc1..4743612 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.spice
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_hdll__sdlclkp_4 CLK GATE SCE VGND VNB VPB VPWR GCLK
-M1000 a_425_47# a_277_243# a_310_47# VNB nshort w=360000u l=150000u
-+  ad=2.196e+11p pd=1.96e+06u as=1.53e+11p ps=1.57e+06u
-M1001 a_27_47# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=2.664e+11p pd=2.97e+06u as=1.3078e+12p ps=1.141e+07u
-M1002 a_27_47# GATE a_117_369# VPB phighvt w=640000u l=180000u
-+  ad=2.373e+11p pd=2.08e+06u as=1.472e+11p ps=1.74e+06u
-M1003 GCLK a_1125_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=7.15e+11p pd=5.43e+06u as=2.2235e+12p ps=1.837e+07u
-M1004 GCLK a_1125_47# VGND VNB nshort w=650000u l=150000u
-+  ad=5.3625e+11p pd=4.25e+06u as=0p ps=0u
-M1005 a_421_413# a_280_21# a_310_47# VPB phighvt w=420000u l=180000u
-+  ad=1.806e+11p pd=1.7e+06u as=1.47e+11p ps=1.54e+06u
-M1006 a_280_21# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1007 a_117_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_280_21# a_277_243# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1009 VPWR CLK a_1125_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1010 VPWR a_505_315# a_421_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1125_47# a_505_315# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_310_47# a_277_243# a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_280_21# a_277_243# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1014 VGND a_1125_47# GCLK VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_505_315# a_425_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND SCE a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 GCLK a_1125_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1217_47# a_505_315# a_1125_47# VNB nshort w=650000u l=150000u
-+  ad=1.365e+11p pd=1.72e+06u as=2.015e+11p ps=1.92e+06u
-M1019 a_505_315# a_310_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1020 VPWR a_1125_47# GCLK VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND CLK a_1217_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 GCLK a_1125_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_280_21# CLK VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1024 VGND a_1125_47# GCLK VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_1125_47# GCLK VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_310_47# a_280_21# a_27_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_505_315# a_310_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
+X0 VPWR SCE a_117_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X1 a_1217_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_421_413# a_505_315# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X3 GCLK a_1125_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 GCLK a_1125_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VGND a_1125_47# GCLK VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X6 VPWR a_1125_47# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VGND GATE a_27_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND a_1125_47# GCLK VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_1125_47# a_505_315# a_1217_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VGND CLK a_280_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR a_310_47# a_505_315# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_27_47# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VPWR CLK a_280_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X14 a_117_369# GATE a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X15 GCLK a_1125_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 GCLK a_1125_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_310_47# a_280_21# a_421_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X18 a_425_47# a_505_315# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_277_243# a_280_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X20 a_277_243# a_280_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_1125_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X22 a_27_47# a_280_21# a_310_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X23 VPWR a_1125_47# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 a_310_47# a_277_243# a_425_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X25 VGND a_310_47# a_505_315# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 VPWR a_505_315# a_1125_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 a_27_47# a_277_243# a_310_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.cdl b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.cdl
index 15e1fbd..73da6be 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.cdl
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.cdl
@@ -17,92 +17,92 @@
 .SUBCKT sky130_fd_sc_hdll__sedfxbp_1 CLK D DE SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI14 net155 M1 VPB 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
-MI637 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI14 net155 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 S0 clkneg 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
-MI651 db clkpos 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
-MI645 Q S0 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
-MI658 net123 M1 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
-MI638 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI13 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net127 q1 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
-MI639 M1 M0 VPB phighvt m=1 w=0.75 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos 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
-MI659 M0 clkneg 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
-MI17 q1 S0 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net116 deneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 net107 sceneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI645 Q S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net123 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 VPWR SCD VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 net104 D VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net104 SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 net87 q1 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 deneg DE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 VPWR DE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 sceneg SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI52 Q_N q1 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
-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
+MI638 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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
-MI641 net235 q1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nshort m=1 w=0.36 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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S0 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net224 M1 VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net104 sceneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI643 net127 q1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 q1 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI639 M1 M0 VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 q1 S0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net116 deneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 net107 sceneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 VPWR SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 net104 D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net104 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 net87 q1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 deneg DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 VPWR DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 sceneg SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI52 Q_N q1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 sceneg SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.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
+MI641 net235 q1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net104 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net224 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.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net104 sceneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 q1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net200 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI45 sceneg SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net104 D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 S0 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 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
+MI15 S0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI41 net192 q1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 VGND deneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 deneg DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 net192 q1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 net203 DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI49 net176 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI48 VGND SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 VGND deneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 deneg DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net203 DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 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
-MI48 VGND 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
-MI53 Q_N q1 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MI53 Q_N q1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sedfxbp_1
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.netlist.tsv b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.netlist.tsv
index 7ccdceb..87b7399 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.netlist.tsv
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.netlist.tsv
@@ -1,46 +1,46 @@
 sky130_fd_sc_hdll__sedfxbp_1	CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI14	MOSFET	net155	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	S0	clkneg	net155	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S0	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net123	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net127	q1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.75	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net127	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net123	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	q1	S0	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net116	deneg	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	net107	sceneg	db	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	VPWR	SCD	net107	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	net104	D	net116	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net104	SCE	db	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	net87	q1	net104	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	deneg	DE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	VPWR	DE	net87	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	sceneg	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI52	MOSFET	Q_N	q1	VPWR	VPB	phighvt	1	1.0	0.18	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
-MI641	MOSFET	net235	q1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net235	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S0	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net224	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	net224	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net104	sceneg	db	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	q1	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	sceneg	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net104	D	net203	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net200	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	S0	clkpos	net200	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	net192	q1	net104	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	VGND	deneg	net192	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	deneg	DE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net203	DE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	net176	SCE	db	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI48	MOSFET	VGND	SCD	net176	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI53	MOSFET	Q_N	q1	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net155	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	S0	clkneg	net155	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net123	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net127	q1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.75	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net127	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net123	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	q1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net116	deneg	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	net107	sceneg	db	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	VPWR	SCD	net107	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	net104	D	net116	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net104	SCE	db	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	net87	q1	net104	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	deneg	DE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	VPWR	DE	net87	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	sceneg	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI52	MOSFET	Q_N	q1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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
+MI641	MOSFET	net235	q1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net235	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S0	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net224	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	net224	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net104	sceneg	db	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	q1	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	sceneg	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net104	D	net203	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net200	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	S0	clkpos	net200	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	net192	q1	net104	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	VGND	deneg	net192	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	deneg	DE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net203	DE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	net176	SCE	db	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI48	MOSFET	VGND	SCD	net176	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI53	MOSFET	Q_N	q1	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.spice b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.spice
index f0df6cf..e7b440e 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.spice
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_hdll__sedfxbp_1 CLK D DE SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 a_1787_159# a_1611_413# VPWR VPB phighvt w=750000u l=180000u
-+  ad=2.025e+11p pd=2.04e+06u as=1.93535e+12p ps=1.705e+07u
-M1001 Q a_2266_413# VGND VNB nshort w=650000u l=150000u
-+  ad=1.9825e+11p pd=1.91e+06u as=1.4487e+12p ps=1.404e+07u
-M1002 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1003 a_2165_413# a_1787_159# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1004 a_2266_413# a_27_47# a_2165_413# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1005 VPWR DE a_455_324# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1006 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1007 a_319_47# a_851_264# a_779_47# VNB nshort w=420000u l=150000u
-+  ad=2.478e+11p pd=2.86e+06u as=1.932e+11p ps=1.76e+06u
-M1008 a_2181_47# a_1787_159# VGND VNB nshort w=420000u l=150000u
-+  ad=1.356e+11p pd=1.51e+06u as=0p ps=0u
-M1009 Q a_2266_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.15e+11p pd=2.63e+06u as=0p ps=0u
-M1010 a_2266_413# a_211_363# a_2181_47# VNB nshort w=360000u l=150000u
-+  ad=1.494e+11p pd=1.55e+06u as=0p ps=0u
-M1011 a_1611_413# a_27_47# a_985_47# VNB nshort w=360000u l=150000u
-+  ad=1.404e+11p pd=1.5e+06u as=6.015e+11p ps=4.57e+06u
-M1012 a_985_47# a_955_21# a_1376_369# VPB phighvt w=640000u l=180000u
-+  ad=4.837e+11p pd=4.13e+06u as=2.24e+11p ps=1.98e+06u
-M1013 VGND SCE a_955_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1014 VGND a_2266_413# a_851_264# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1015 a_985_47# a_955_21# a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Q_N a_851_264# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1017 VPWR SCE a_955_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.76e+11p ps=1.83e+06u
-M1018 a_409_369# D a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=1.472e+11p pd=1.74e+06u as=3.84e+11p ps=3.76e+06u
-M1019 a_985_47# SCE a_1373_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1020 VGND a_851_264# a_2391_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.32e+11p ps=1.49e+06u
-M1021 a_787_369# DE VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.432e+11p pd=2.04e+06u as=0p ps=0u
-M1022 a_319_47# a_851_264# a_787_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1611_413# a_211_363# a_985_47# VPB phighvt w=420000u l=180000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1024 VPWR a_1787_159# a_1712_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.617e+11p ps=1.61e+06u
-M1025 VPWR a_455_324# a_409_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_985_47# SCE a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Q_N a_851_264# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1028 a_1712_413# a_27_47# a_1611_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_2266_413# a_851_264# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1030 VGND DE a_455_324# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1031 a_779_47# a_455_324# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1376_369# SCD VPWR VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1034 a_1373_119# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR a_851_264# a_2360_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.058e+11p ps=1.82e+06u
-M1036 VGND a_1787_159# a_1738_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.518e+11p ps=1.6e+06u
-M1037 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1038 a_1738_47# a_211_363# a_1611_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_2391_47# a_27_47# a_2266_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_413_47# D a_319_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1041 VGND DE a_413_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_2360_413# a_211_363# a_2266_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_1787_159# a_1611_413# VGND VNB nshort w=640000u l=150000u
-+  ad=1.664e+11p pd=1.8e+06u as=0p ps=0u
+X0 VGND a_1787_159# a_2181_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_455_324# DE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X2 VPWR a_1611_413# a_1787_159# VPB sky130_fd_pr__pfet_01v8_hvt w=750000u l=180000u
+X3 a_955_21# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X5 VGND SCD a_1373_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_2266_413# a_211_363# a_2360_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X7 a_2266_413# a_27_47# a_2391_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X8 VPWR DE a_787_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X9 a_787_369# a_851_264# a_319_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X10 a_413_47# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND a_27_47# a_211_363# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND a_455_324# a_779_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_985_47# a_27_47# a_1611_413# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X14 a_1738_47# a_1787_159# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VPWR SCD a_1376_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X16 a_985_47# a_211_363# a_1611_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X17 VGND a_851_264# Q_N VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 a_2165_413# a_27_47# a_2266_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X19 a_2391_47# a_851_264# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 VGND a_1611_413# a_1787_159# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 a_319_47# SCE a_985_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X23 VGND a_2266_413# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X24 a_455_324# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VPWR a_27_47# a_211_363# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X26 a_1611_413# a_27_47# a_1712_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X27 a_319_47# D a_413_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_319_47# a_955_21# a_985_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_1611_413# a_211_363# a_1738_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X30 a_409_369# a_455_324# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X31 a_955_21# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X32 a_851_264# a_2266_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X33 a_2181_47# a_211_363# a_2266_413# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X34 a_779_47# a_851_264# a_319_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 VPWR a_2266_413# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X36 a_1712_413# a_1787_159# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X37 a_851_264# a_2266_413# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_2360_413# a_851_264# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X39 a_319_47# D a_409_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X40 VPWR a_1787_159# a_2165_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X41 a_1376_369# a_955_21# a_985_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X42 a_1373_119# SCE a_985_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X43 VPWR a_851_264# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.cdl b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.cdl
index 4d5b606..874aae2 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.cdl
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.cdl
@@ -17,92 +17,92 @@
 .SUBCKT sky130_fd_sc_hdll__sedfxbp_2 CLK D DE SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI14 net155 M1 VPB 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
-MI637 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI14 net155 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 S0 clkneg 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
-MI651 db clkpos 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
-MI645 Q S0 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net144 M1 VPB 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
-MI638 clkneg CLK VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI13 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net127 q1 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
-MI639 M1 M0 VPB phighvt m=1 w=0.75 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos 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
-MI659 M0 clkneg 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
-MI17 q1 S0 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net116 deneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 net107 sceneg VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI645 Q S0 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net144 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 VPWR SCD VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 net104 D VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net104 SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 net96 q1 VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 deneg DE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 VPWR DE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 sceneg SCE VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI52 Q_N q1 VPB phighvt m=2 w=1.0 l=0.18 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
+MI638 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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
-MI641 net240 q1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nshort m=1 w=0.36 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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S0 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net224 M1 VNB nshort m=1 w=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.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net104 sceneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI643 net127 q1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 q1 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI639 M1 M0 VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 q1 S0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net116 deneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 net107 sceneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 VPWR SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 net104 D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net104 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 net96 q1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 deneg DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 VPWR DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 sceneg SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI52 Q_N q1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 sceneg SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.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
+MI641 net240 q1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S0 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net104 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net224 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.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net104 sceneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 q1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net200 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI45 sceneg SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net104 D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 S0 clkpos VNB nshort m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 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
+MI15 S0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI41 net192 q1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 VGND deneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 deneg DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 net192 q1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 net180 DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI49 net171 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI48 VGND SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 VGND deneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 deneg DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net180 DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 net171 SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI48 VGND SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI53 Q_N q1 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MI53 Q_N q1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sedfxbp_2
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.netlist.tsv b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.netlist.tsv
index 061fe84..8bb4262 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.netlist.tsv
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.netlist.tsv
@@ -1,46 +1,46 @@
 sky130_fd_sc_hdll__sedfxbp_2	CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI14	MOSFET	net155	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	S0	clkneg	net155	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S0	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net144	M1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net127	q1	VPWR	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.75	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net127	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net144	VPB	phighvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	q1	S0	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net116	deneg	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	net107	sceneg	db	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	VPWR	SCD	net107	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	net104	D	net116	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net104	SCE	db	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	net96	q1	net104	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	deneg	DE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	VPWR	DE	net96	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	sceneg	SCE	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI52	MOSFET	Q_N	q1	VPWR	VPB	phighvt	2	1.0	0.18	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
-MI641	MOSFET	net240	q1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net240	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S0	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net224	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	net224	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net104	sceneg	db	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	q1	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	sceneg	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net104	D	net180	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net200	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	S0	clkpos	net200	VNB	nshort	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	net192	q1	net104	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	VGND	deneg	net192	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	deneg	DE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net180	DE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	net171	SCE	db	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI48	MOSFET	VGND	SCD	net171	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI53	MOSFET	Q_N	q1	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net155	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	S0	clkneg	net155	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S0	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net144	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net127	q1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.75	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net127	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net144	VPB	pfet_01v8_hvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	q1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net116	deneg	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	net107	sceneg	db	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	VPWR	SCD	net107	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	net104	D	net116	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net104	SCE	db	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	net96	q1	net104	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	deneg	DE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	VPWR	DE	net96	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	sceneg	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI52	MOSFET	Q_N	q1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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
+MI641	MOSFET	net240	q1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net240	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S0	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net224	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	net224	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net104	sceneg	db	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	q1	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	sceneg	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net104	D	net180	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net200	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	S0	clkpos	net200	VNB	nfet_01v8	1	0.36	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	net192	q1	net104	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	VGND	deneg	net192	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	deneg	DE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net180	DE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	net171	SCE	db	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI48	MOSFET	VGND	SCD	net171	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI53	MOSFET	Q_N	q1	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.spice b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.spice
index 0a5b22f..a0954d8 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.spice
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.spice
@@ -16,100 +16,52 @@
 
 
 .subckt sky130_fd_sc_hdll__sedfxbp_2 CLK D DE SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 a_1787_159# a_1611_413# VPWR VPB phighvt w=750000u l=180000u
-+  ad=2.025e+11p pd=2.04e+06u as=2.49535e+12p ps=2.217e+07u
-M1001 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.7892e+12p ps=1.767e+07u
-M1002 a_2165_413# a_1787_159# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1003 a_2266_413# a_27_47# a_2165_413# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1004 VGND a_851_264# a_2414_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.32e+11p ps=1.49e+06u
-M1005 VPWR a_2266_413# a_851_264# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1006 VPWR DE a_455_324# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1007 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1008 VPWR a_2266_413# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1009 a_319_47# a_851_264# a_779_47# VNB nshort w=420000u l=150000u
-+  ad=2.478e+11p pd=2.86e+06u as=1.932e+11p ps=1.76e+06u
-M1010 a_2181_47# a_1787_159# VGND VNB nshort w=420000u l=150000u
-+  ad=1.356e+11p pd=1.51e+06u as=0p ps=0u
-M1011 VPWR a_851_264# Q_N VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1012 a_2266_413# a_211_363# a_2181_47# VNB nshort w=360000u l=150000u
-+  ad=1.908e+11p pd=1.78e+06u as=0p ps=0u
-M1013 a_1611_413# a_27_47# a_985_47# VNB nshort w=360000u l=150000u
-+  ad=1.404e+11p pd=1.5e+06u as=6.015e+11p ps=4.57e+06u
-M1014 a_985_47# a_955_21# a_1376_369# VPB phighvt w=640000u l=180000u
-+  ad=4.837e+11p pd=4.13e+06u as=2.24e+11p ps=1.98e+06u
-M1015 VGND SCE a_955_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1016 Q a_2266_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_851_264# Q_N VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1018 VGND a_2266_413# a_851_264# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1019 a_985_47# a_955_21# a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Q_N a_851_264# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_2414_47# a_27_47# a_2266_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR SCE a_955_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.76e+11p ps=1.83e+06u
-M1023 a_409_369# D a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=1.472e+11p pd=1.74e+06u as=3.84e+11p ps=3.76e+06u
-M1024 a_985_47# SCE a_1373_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1025 a_787_369# DE VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.432e+11p pd=2.04e+06u as=0p ps=0u
-M1026 a_319_47# a_851_264# a_787_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1611_413# a_211_363# a_985_47# VPB phighvt w=420000u l=180000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1028 VPWR a_1787_159# a_1712_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.617e+11p ps=1.61e+06u
-M1029 VPWR a_455_324# a_409_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_985_47# SCE a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_2266_413# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.405e+11p ps=2.04e+06u
-M1032 a_1712_413# a_27_47# a_1611_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Q_N a_851_264# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND DE a_455_324# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1035 a_779_47# a_455_324# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1376_369# SCD VPWR VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1038 a_1373_119# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_851_264# a_2360_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.058e+11p ps=1.82e+06u
-M1040 VGND a_1787_159# a_1738_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.518e+11p ps=1.6e+06u
-M1041 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1042 a_1738_47# a_211_363# a_1611_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_413_47# D a_319_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1044 Q a_2266_413# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VGND DE a_413_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_2360_413# a_211_363# a_2266_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_1787_159# a_1611_413# VGND VNB nshort w=640000u l=150000u
-+  ad=1.664e+11p pd=1.8e+06u as=0p ps=0u
+X0 VGND a_1787_159# a_2181_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND a_2266_413# Q VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 a_455_324# DE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X3 VPWR a_1611_413# a_1787_159# VPB sky130_fd_pr__pfet_01v8_hvt w=750000u l=180000u
+X4 Q_N a_851_264# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_955_21# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_27_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X7 VGND SCD a_1373_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_2266_413# a_211_363# a_2360_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X9 a_851_264# a_2266_413# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR DE a_787_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X11 VPWR a_2266_413# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X12 a_787_369# a_851_264# a_319_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X13 a_2414_47# a_851_264# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_413_47# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VGND a_27_47# a_211_363# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VGND a_455_324# a_779_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_985_47# a_27_47# a_1611_413# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X18 a_1738_47# a_1787_159# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_851_264# a_2266_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X20 VPWR SCD a_1376_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X21 a_985_47# a_211_363# a_1611_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X22 Q a_2266_413# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 a_2165_413# a_27_47# a_2266_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X24 a_27_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VGND a_1611_413# a_1787_159# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X26 a_319_47# SCE a_985_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X27 Q_N a_851_264# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 a_455_324# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VGND a_851_264# Q_N VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 VPWR a_27_47# a_211_363# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X31 a_1611_413# a_27_47# a_1712_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X32 a_319_47# D a_413_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_319_47# a_955_21# a_985_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_1611_413# a_211_363# a_1738_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X35 a_409_369# a_455_324# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X36 a_955_21# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X37 a_2181_47# a_211_363# a_2266_413# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X38 a_779_47# a_851_264# a_319_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 a_1712_413# a_1787_159# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X40 a_2360_413# a_851_264# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X41 Q a_2266_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X42 a_2266_413# a_27_47# a_2414_47# VNB sky130_fd_pr__nfet_01v8 w=360000u l=150000u
+X43 a_319_47# D a_409_369# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X44 VPWR a_1787_159# a_2165_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X45 a_1376_369# a_955_21# a_985_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X46 a_1373_119# SCE a_985_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X47 VPWR a_851_264# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/tap/sky130_fd_sc_hdll__tap.spice b/cells/tap/sky130_fd_sc_hdll__tap.spice
index e36039e..f0b9321 100644
--- a/cells/tap/sky130_fd_sc_hdll__tap.spice
+++ b/cells/tap/sky130_fd_sc_hdll__tap.spice
@@ -15,14978 +15,331 @@
 * SPDX-License-Identifier: Apache-2.0
 
 
-.subckt sky130_fd_sc_hdll__o22ai_2 B2 B1 Y A1 A2 VPB VNB VGND VPWR
-M1000 Y A2 a_515_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=8.7e+11p ps=7.74e+06u
-M1001 VPWR B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=8.7e+11p ps=7.74e+06u
-M1002 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.2415e+12p pd=1.032e+07u as=4.81e+11p ps=4.08e+06u
-M1003 a_27_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=4.81e+11p pd=4.08e+06u as=0p ps=0u
-M1007 a_27_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_515_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1 a_515_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_515_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand2_1 Y B A VPB VNB VGND VPWR
-M1000 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=5.4e+11p ps=5.08e+06u
-M1001 Y A a_123_47# VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=1.755e+11p ps=1.84e+06u
-M1002 a_123_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1003 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor3_4 A C B Y VPB VNB VGND VPWR
-M1000 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=1.248e+12p pd=1.164e+07u as=1.4235e+12p ps=1.348e+07u
-M1001 a_497_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=1.43e+12p ps=1.286e+07u
-M1002 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1004 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y C a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1007 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_497_297# C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_297# B a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_497_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_497_297# C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_297# B a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a21bo_1 X A1 B1_N A2 VNB VPB VGND VPWR
-M1000 a_326_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.65e+11p pd=5.13e+06u as=6.834e+11p ps=6.52e+06u
-M1001 a_412_47# A1 a_235_297# VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=1.755e+11p ps=1.84e+06u
-M1002 VPWR B1_N a_27_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1003 a_235_297# a_27_413# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=9.0705e+11p ps=5.49e+06u
-M1004 VGND B1_N a_27_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.323e+11p ps=1.47e+06u
-M1005 X a_235_297# VGND VNB nshort w=650000u l=150000u
-+  ad=2.4375e+11p pd=2.05e+06u as=0p ps=0u
-M1006 VGND A2 a_412_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A1 a_326_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_326_297# a_27_413# a_235_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.55e+06u
-M1009 X a_235_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.85e+11p pd=2.77e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand2b_2 B Y A_N VNB VPB VGND VPWR
-M1000 a_215_47# a_27_93# Y VNB nshort w=650000u l=150000u
-+  ad=5.135e+11p pd=5.48e+06u as=1.755e+11p ps=1.84e+06u
-M1001 VPWR a_27_93# Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.0628e+12p pd=8.23e+06u as=6.5e+11p ps=5.3e+06u
-M1002 Y a_27_93# a_215_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_215_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.172e+11p ps=3.3e+06u
-M1004 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B a_215_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A_N a_27_93# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1007 Y a_27_93# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A_N a_27_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-.ends
-.subckt sky130_fd_sc_hdll__a31oi_1 VGND VPWR Y B1 A2 A1 A3 VPB VNB
-M1000 VPWR A2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.95e+11p pd=5.19e+06u as=6.35e+11p ps=5.27e+06u
-M1001 a_117_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_203_47# A2 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=2.3075e+11p pd=2.01e+06u as=1.755e+11p ps=1.84e+06u
-M1003 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=5.2e+11p pd=4.2e+06u as=2.4375e+11p ps=2.05e+06u
-M1004 a_117_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_119_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1007 Y A1 a_203_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__mux2i_1 A1 S A0 Y VPB VNB VGND VPWR
-M1000 Y A0 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=5.6e+11p ps=5.12e+06u
-M1001 a_27_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.2e+11p ps=5.64e+06u
-M1002 a_207_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=3.575e+11p pd=3.7e+06u as=1.755e+11p ps=1.84e+06u
-M1003 VGND S a_303_205# VNB nshort w=650000u l=150000u
-+  ad=3.445e+11p pd=3.66e+06u as=2.275e+11p ps=2e+06u
-M1004 VPWR S a_303_205# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3e+11p ps=2.6e+06u
-M1005 Y A0 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.835e+11p ps=3.78e+06u
-M1006 VPWR a_303_205# a_215_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=4.5e+11p ps=2.9e+06u
-M1007 a_215_297# A1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_303_205# a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_207_47# S VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__clkbuf_16 X A VNB VPB VGND VPWR
-M1000 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=1.4679e+12p pd=1.623e+07u as=1.1298e+12p ps=1.21e+07u
-M1001 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.4e+12p pd=2.08e+07u as=3.245e+12p ps=2.849e+07u
-M1004 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_118_297# A VGND VNB nshort w=420000u l=150000u
-+  ad=2.772e+11p pd=3e+06u as=0p ps=0u
-M1007 VGND A a_118_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_118_297# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_118_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6e+11p pd=5.2e+06u as=0p ps=0u
-M1014 a_118_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A a_118_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A a_118_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR A a_118_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o211ai_2 A1 A2 B1 Y C1 VNB VPB VGND VPWR
-M1000 a_316_47# B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=6.63e+11p pd=5.94e+06u as=6.175e+11p ps=5.8e+06u
-M1001 Y A2 a_527_297# VPB phighvt w=1e+06u l=180000u
-+  ad=9e+11p pd=7.8e+06u as=8.5e+11p ps=7.7e+06u
-M1002 a_27_47# B1 a_316_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.15e+12p pd=1.03e+07u as=0p ps=0u
-M1004 a_316_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=6.1425e+11p ps=5.79e+06u
-M1005 VPWR A1 a_527_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_47# C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.145e+11p ps=1.96e+06u
-M1008 a_527_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_316_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A1 a_316_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A2 a_316_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_527_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y C1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or2b_1 A B_N X VGND VPWR VNB VPB
-M1000 VGND B_N a_27_53# VNB nshort w=420000u l=150000u
-+  ad=5.7225e+11p pd=4.52e+06u as=1.302e+11p ps=1.46e+06u
-M1001 X a_229_297# VGND VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=0p ps=0u
-M1002 a_27_53# B_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=4.241e+11p ps=4.1e+06u
-M1003 a_319_297# a_27_53# a_229_297# VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=1.134e+11p ps=1.38e+06u
-M1004 VGND A a_229_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1005 VPWR A a_319_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_229_297# a_27_53# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_229_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__dlrtn_1 RESET_B D GATE_N Q VGND VPWR VPB VNB
-M1000 VGND a_750_21# a_708_47# VNB nshort w=420000u l=150000u
-+  ad=5.6425e+11p pd=6.14e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR GATE_N a_27_363# VPB phighvt w=640000u l=180000u
-+  ad=1.131e+12p pd=9.75e+06u as=1.728e+11p ps=1.82e+06u
-M1002 a_203_47# a_27_363# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1003 VPWR a_750_21# a_702_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1004 a_503_369# a_319_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=0p ps=0u
-M1005 a_708_47# a_203_47# a_604_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1006 Q a_750_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1007 VGND D a_319_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1008 VPWR D a_319_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1009 VGND RESET_B a_981_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.6575e+11p ps=1.81e+06u
-M1010 a_604_47# a_27_363# a_500_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1011 Q a_750_21# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1012 VPWR RESET_B a_750_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1013 a_981_47# a_604_47# a_750_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1014 VGND GATE_N a_27_363# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1015 a_702_413# a_27_363# a_604_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1016 a_203_47# a_27_363# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1017 a_604_47# a_203_47# a_503_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_500_47# a_319_369# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_750_21# a_604_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__clkmux2_2 VGND VPWR S A1 A0 X VPB VNB
-M1000 VPWR a_79_199# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.0664e+12p pd=8.08e+06u as=2.9e+11p ps=2.58e+06u
-M1001 VGND a_741_21# a_570_47# VNB nshort w=420000u l=150000u
-+  ad=6.32e+11p pd=5.72e+06u as=3.591e+11p ps=2.55e+06u
-M1002 a_335_309# S VPWR VPB phighvt w=940000u l=180000u
-+  ad=3.901e+11p pd=2.71e+06u as=0p ps=0u
-M1003 X a_79_199# VGND VNB nshort w=520000u l=150000u
-+  ad=1.404e+11p pd=1.58e+06u as=0p ps=0u
-M1004 a_741_21# S VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1005 X a_79_199# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_691_309# A1 a_79_199# VPB phighvt w=940000u l=180000u
-+  ad=2.444e+11p pd=2.4e+06u as=9.447e+11p ps=3.89e+06u
-M1007 a_570_47# A0 a_79_199# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.121e+11p ps=1.85e+06u
-M1008 a_337_47# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1009 a_741_21# S VPWR VPB phighvt w=940000u l=180000u
-+  ad=2.726e+11p pd=2.46e+06u as=0p ps=0u
-M1010 VGND a_79_199# X VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_79_199# A0 a_335_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_741_21# a_691_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_79_199# A1 a_337_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or2_8 X A B VNB VPB VGND VPWR
-M1000 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.71e+12p pd=1.542e+07u as=8.5e+11p ps=7.7e+06u
-M1001 VGND A a_123_47# VNB nshort w=650000u l=150000u
-+  ad=1.963e+12p pd=1.514e+07u as=3.51e+11p ps=3.68e+06u
-M1002 X a_123_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=0p ps=0u
-M1003 VGND a_123_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.02e+11p ps=7.36e+06u
-M1004 a_123_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_123_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_297# B a_123_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1007 VPWR a_123_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_123_47# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_123_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_123_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_123_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_123_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_123_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_123_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND B a_123_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_123_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_123_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_123_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_123_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_123_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_123_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_123_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o21ai_2 B1 Y A2 A1 VGND VPWR VPB VNB
-M1000 a_29_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=8.7425e+11p pd=7.89e+06u as=5.005e+11p ps=4.14e+06u
-M1001 Y B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6e+11p pd=5.2e+06u as=9.95e+11p ps=7.99e+06u
-M1002 a_120_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6.7e+11p pd=5.34e+06u as=0p ps=0u
-M1003 a_120_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B1 a_29_47# VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=0p ps=0u
-M1005 VPWR A1 a_120_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_29_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A2 a_120_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A1 a_29_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_29_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A2 a_29_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and3_4 A B C X VNB VPB VGND VPWR
-M1000 X a_85_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6e+11p pd=5.2e+06u as=1.435e+12p ps=1.087e+07u
-M1001 a_85_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6.1e+11p pd=5.22e+06u as=0p ps=0u
-M1002 a_185_47# A a_85_297# VNB nshort w=650000u l=150000u
-+  ad=3.2175e+11p pd=2.29e+06u as=1.9825e+11p ps=1.91e+06u
-M1003 X a_85_297# VGND VNB nshort w=650000u l=150000u
-+  ad=4.615e+11p pd=4.02e+06u as=7.085e+11p ps=6.08e+06u
-M1004 VPWR a_85_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_85_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_314_47# B a_185_47# VNB nshort w=650000u l=150000u
-+  ad=1.365e+11p pd=1.72e+06u as=0p ps=0u
-M1007 VGND C a_314_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_85_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR C a_85_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_85_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_85_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_85_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_85_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__clkbuf_4 X A VGND VPWR VPB VNB
-M1000 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=4.011e+11p pd=4.43e+06u as=1.323e+11p ps=1.47e+06u
-M1001 X a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=2.982e+11p pd=3.1e+06u as=0p ps=0u
-M1002 X a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=9.6e+11p pd=7.92e+06u as=2.75e+11p ps=2.55e+06u
-M1004 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=6e+11p ps=5.2e+06u
-M1005 VGND a_27_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_27_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__clkinv_4 A Y VNB VPB VPWR VGND
-M1000 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.27e+12p pd=1.054e+07u as=9e+11p ps=7.8e+06u
-M1001 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=2.772e+11p pd=3e+06u as=4.851e+11p ps=4.83e+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=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  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 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  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=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sdfstp_4 CLK D SCD Q SCE SET_B VPWR VGND VPB VNB
-M1000 VPWR SET_B a_1229_21# VPB phighvt w=420000u l=180000u
-+  ad=2.3974e+12p pd=2.127e+07u as=1.722e+11p ps=1.66e+06u
-M1001 VGND a_349_21# a_295_47# VNB nshort w=420000u l=150000u
-+  ad=1.73245e+12p pd=1.7e+07u as=1.134e+11p ps=1.38e+06u
-M1002 a_2067_47# a_1951_295# a_1995_47# VNB nshort w=420000u l=150000u
-+  ad=2.016e+11p pd=1.8e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_1745_329# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=4.746e+11p pd=4.26e+06u as=0p ps=0u
-M1004 a_1951_295# a_1745_329# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1005 a_1995_47# a_693_369# a_1745_329# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.332e+11p ps=2.5e+06u
-M1006 a_1891_413# a_877_369# a_1745_329# VPB phighvt w=420000u l=180000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1007 VGND SCE a_349_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1008 a_1075_413# a_877_369# a_201_47# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.99e+11p ps=3.24e+06u
-M1009 VGND a_2447_47# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1010 VPWR SCD a_27_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=3.456e+11p ps=3.64e+06u
-M1011 a_1229_21# a_1075_413# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Q a_2447_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1013 Q a_2447_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR SCE a_349_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1015 VGND SET_B a_2067_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_2447_47# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND SET_B a_1467_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1018 a_877_369# a_693_369# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1019 VGND a_1229_21# a_1177_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1020 VPWR a_1951_295# a_1891_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND CLK a_693_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1022 a_1951_295# a_1745_329# VGND VNB nshort w=420000u l=150000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1023 a_1654_47# a_1075_413# VGND VNB nshort w=640000u l=150000u
-+  ad=5.088e+11p pd=2.87e+06u as=0p ps=0u
-M1024 a_1467_47# a_1075_413# a_1229_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.512e+11p ps=1.56e+06u
-M1025 Q a_2447_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_369# a_349_21# a_201_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_119_47# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1028 a_1177_47# a_877_369# a_1075_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1029 VPWR a_2447_47# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND a_1745_329# a_2447_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1031 a_877_369# a_693_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1032 a_1663_329# a_1075_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=1.932e+11p pd=2.14e+06u as=0p ps=0u
-M1033 a_1075_413# a_693_369# a_201_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1034 a_1745_329# a_693_369# a_1663_329# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_295_47# D a_201_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND a_2447_47# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_201_47# SCE a_119_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Q a_2447_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_211_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.472e+11p pd=1.74e+06u as=0p ps=0u
-M1040 VPWR a_1745_329# a_2447_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1041 a_201_47# D a_211_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_1169_413# a_693_369# a_1075_413# VPB phighvt w=420000u l=180000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1043 VPWR a_1229_21# a_1169_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VPWR CLK a_693_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1045 a_1745_329# a_877_369# a_1654_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a2bb2oi_1 A1_N Y VGND VPWR B2 B1 A2_N VPB VNB
-M1000 a_521_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=1.82e+11p pd=1.86e+06u as=2.6e+11p ps=2.1e+06u
-M1001 a_119_47# A2_N a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=2.3e+11p ps=2.46e+06u
-M1002 a_117_297# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.7e+11p ps=5.14e+06u
-M1003 VGND A2_N a_119_47# VNB nshort w=650000u l=150000u
-+  ad=9.425e+11p pd=6.8e+06u as=2.145e+11p ps=1.96e+06u
-M1004 Y a_119_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_409_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6.4e+11p pd=5.28e+06u as=0p ps=0u
-M1006 a_409_297# a_119_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1007 a_119_47# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND B1 a_521_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B2 a_409_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor4bb_2 D_N C_N A Y B VNB VPB VGND VPWR
-M1000 Y a_216_93# VGND VNB nshort w=650000u l=150000u
-+  ad=9.295e+11p pd=8.06e+06u as=1.29595e+12p ps=1.29e+07u
-M1001 a_823_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.65e+11p pd=7.73e+06u as=5.43625e+11p ps=5.26e+06u
-M1002 a_216_93# C_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1003 a_433_297# a_216_93# a_343_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=8.3e+11p ps=7.66e+06u
-M1004 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_27_93# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_823_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR D_N a_27_93# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1009 a_823_297# B a_433_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y a_27_93# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_343_297# a_27_93# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1012 VGND a_216_93# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_216_93# C_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1014 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_433_297# B a_823_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y a_27_93# a_343_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_343_297# a_216_93# a_433_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND D_N a_27_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-.ends
-.subckt sky130_fd_sc_hdll__isobufsrc_2 A SLEEP X VPB VNB VGND VPWR
-M1000 VPWR SLEEP a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=4.034e+11p pd=3.96e+06u as=8.5e+11p ps=7.7e+06u
-M1001 VGND A a_271_21# VNB nshort w=420000u l=150000u
-+  ad=6.5345e+11p pd=6.97e+06u as=1.092e+11p ps=1.36e+06u
-M1002 a_27_297# a_271_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1003 X a_271_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=4.81e+11p pd=4.08e+06u as=0p ps=0u
-M1005 VGND a_271_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_271_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1007 a_27_297# SLEEP VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_271_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sdfxbp_1 VGND VPWR SCD Q_N D SCE CLK Q VNB VPB
-M1000 VPWR a_1179_183# a_1111_413# VPB phighvt w=420000u l=180000u
-+  ad=1.70555e+12p pd=1.505e+07u as=1.47e+11p ps=1.54e+06u
-M1001 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.3638e+12p ps=1.273e+07u
-M1002 Q a_1653_315# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1003 a_1179_183# a_1001_47# VGND VNB nshort w=640000u l=150000u
-+  ad=1.978e+11p pd=1.99e+06u as=0p ps=0u
-M1004 VPWR SCD a_698_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=2.144e+11p ps=1.95e+06u
-M1005 a_1464_413# a_27_47# a_1179_183# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.307e+11p ps=2.19e+06u
-M1006 a_1001_47# a_27_47# a_604_369# VNB nshort w=360000u l=150000u
-+  ad=1.548e+11p pd=1.58e+06u as=2.604e+11p ps=2.88e+06u
-M1007 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1008 VPWR a_1653_315# a_2114_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1009 a_698_369# a_319_47# a_604_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=2.99e+11p ps=3.24e+06u
-M1010 a_604_369# D a_529_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1011 VGND a_1653_315# a_2114_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1012 VPWR a_1464_413# a_1653_315# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1013 a_503_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.08e+11p pd=1.93e+06u as=0p ps=0u
-M1014 VGND a_1179_183# a_1117_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.374e+11p ps=1.52e+06u
-M1015 a_717_47# SCE a_604_369# VNB nshort w=420000u l=150000u
-+  ad=9.66e+10p pd=1.3e+06u as=0p ps=0u
-M1016 a_604_369# D a_503_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND SCE a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1018 VPWR SCE a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1019 a_1111_413# a_27_47# a_1001_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.407e+11p ps=1.51e+06u
-M1020 VGND a_1653_315# a_1615_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.446e+11p ps=1.55e+06u
-M1021 a_1179_183# a_1001_47# VPWR VPB phighvt w=750000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1001_47# a_211_363# a_604_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1024 a_1464_413# a_211_363# a_1179_183# VNB nshort w=360000u l=150000u
-+  ad=1.854e+11p pd=1.75e+06u as=0p ps=0u
-M1025 a_529_47# a_319_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_1653_315# a_1558_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.037e+11p ps=1.81e+06u
-M1027 Q_N a_2114_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1028 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1029 a_1117_47# a_211_363# a_1001_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Q_N a_2114_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1031 a_1558_413# a_211_363# a_1464_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Q a_1653_315# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1033 VGND SCD a_717_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1615_47# a_27_47# a_1464_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_1464_413# a_1653_315# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-.ends
-.subckt sky130_fd_sc_hdll__nor2b_1 B_N Y A VPB VNB VGND VPWR
-M1000 a_253_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.3e+11p pd=2.46e+06u as=3.666e+11p ps=3e+06u
-M1001 VPWR B_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1002 VGND a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=4.912e+11p pd=4.26e+06u as=1.755e+11p ps=1.84e+06u
-M1003 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y a_27_47# a_253_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1005 VGND B_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-.ends
-.subckt sky130_fd_sc_hdll__a21boi_4 Y A1 B1_N A2 VNB VPB VGND VPWR
-M1000 a_724_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=7.8e+11p pd=7.6e+06u as=1.365e+12p ps=1.07e+07u
-M1001 a_724_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=8.905e+11p ps=7.94e+06u
-M1003 VPWR A2 a_227_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.465e+12p pd=1.293e+07u as=2.125e+12p ps=1.825e+07u
-M1004 VGND A2 a_724_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_227_297# a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=6e+11p ps=5.2e+06u
-M1006 a_227_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A1 a_724_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_227_297# a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_724_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR B1_N a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.55e+06u
-M1011 VPWR A2 a_227_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A2 a_724_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_724_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A1 a_227_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B1_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.0225e+11p ps=2.23e+06u
-M1016 Y a_27_47# a_227_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A1 a_227_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A1 a_724_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_227_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y a_27_47# a_227_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_227_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_227_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand3_4 Y A B C VNB VPB VGND VPWR
-M1000 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=2.25e+12p pd=2.05e+07u as=1.74e+12p ps=1.548e+07u
-M1001 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_47# C VGND VNB nshort w=650000u l=150000u
-+  ad=9.62e+11p pd=9.46e+06u as=4.16e+11p ps=3.88e+06u
-M1003 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_485_47# A Y VNB nshort w=650000u l=150000u
-+  ad=1.0335e+12p pd=9.68e+06u as=4.16e+11p ps=3.88e+06u
-M1005 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_47# B a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_485_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_485_47# B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND C a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_47# C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_47# B a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_485_47# B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND C a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__mux2_4 X S A0 A1 VNB VPB VPWR VGND
-M1000 VPWR a_424_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.195e+12p pd=1.039e+07u as=5.8e+11p ps=5.16e+06u
-M1001 a_424_297# A0 a_334_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.4e+11p pd=2.68e+06u as=5.4e+11p ps=5.08e+06u
-M1002 X a_424_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_424_297# VGND VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=8.3525e+11p ps=7.77e+06u
-M1004 VPWR S a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1005 VGND a_424_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_530_47# A1 a_424_297# VNB nshort w=650000u l=150000u
-+  ad=5.8175e+11p pd=3.09e+06u as=2.405e+11p ps=2.04e+06u
-M1007 VPWR a_424_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND S a_530_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_424_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND S a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1011 a_424_297# A0 a_226_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.525e+11p ps=3e+06u
-M1012 VPWR S a_334_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_424_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_222_297# A1 a_424_297# VPB phighvt w=1e+06u l=180000u
-+  ad=6e+11p pd=5.2e+06u as=0p ps=0u
-M1015 a_226_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_222_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_424_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and2b_4 B X A_N VNB VPB VGND VPWR
-M1000 VPWR B a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=1.2757e+12p pd=1.065e+07u as=2.9e+11p ps=2.58e+06u
-M1001 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=6.1e+11p ps=5.22e+06u
-M1002 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=7.61e+11p pd=6.33e+06u as=4.615e+11p ps=4.02e+06u
-M1003 VGND B a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.365e+11p ps=1.72e+06u
-M1004 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_47# a_33_199# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_33_199# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1007 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_119_47# a_33_199# a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1009 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_33_199# A_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1011 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o22a_2 A2 X B1 A1 B2 VNB VPB VGND VPWR
-M1000 a_321_47# B2 a_83_21# VNB nshort w=650000u l=150000u
-+  ad=7.02e+11p pd=6.06e+06u as=1.755e+11p ps=1.84e+06u
-M1001 X a_83_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=1.38e+12p ps=8.76e+06u
-M1002 a_627_297# A2 a_83_21# VPB phighvt w=1e+06u l=180000u
-+  ad=2.3e+11p pd=2.46e+06u as=4.9e+11p ps=2.98e+06u
-M1003 VPWR A1 a_627_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_321_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.655e+11p ps=5.64e+06u
-M1005 a_411_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.3e+11p pd=2.46e+06u as=0p ps=0u
-M1006 X a_83_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
-M1007 a_83_21# B2 a_411_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_321_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_83_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_83_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_83_21# B1 a_321_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a221oi_2 B2 C1 A2 A1 B1 Y VNB VPB VGND VPWR
-M1000 Y B1 a_413_47# VNB nshort w=650000u l=150000u
-+  ad=6.89e+11p pd=6.02e+06u as=3.835e+11p ps=3.78e+06u
-M1001 a_27_297# B1 a_321_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.13e+12p pd=1.026e+07u as=1.515e+12p ps=1.303e+07u
-M1002 VPWR A2 a_321_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1003 a_805_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=3.835e+11p pd=3.78e+06u as=1.183e+12p ps=8.84e+06u
-M1004 Y C1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1005 a_321_297# B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A1 a_805_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_297# B2 a_321_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_321_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B2 a_413_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_413_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A2 a_805_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A1 a_321_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_805_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_321_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_413_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_297# C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_321_297# B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sdfrtp_4 VPB VNB RESET_B VPWR VGND SCE SCD D CLK Q
-M1000 a_1428_47# a_1380_303# a_1322_47# VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.518e+11p ps=1.6e+06u
-M1001 Q a_1972_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6.45e+11p pd=5.29e+06u as=2.2648e+12p ps=2.094e+07u
-M1002 a_213_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=1.7043e+12p ps=1.636e+07u
-M1003 VPWR a_1972_21# a_1951_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
-M1004 a_1972_21# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1005 Q a_1972_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_2157_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=0p ps=0u
-M1007 VPWR SCD a_870_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=1.971e+11p ps=1.81e+06u
-M1008 a_700_389# D a_631_119# VNB nshort w=420000u l=150000u
-+  ad=3.3215e+11p pd=3.47e+06u as=1.302e+11p ps=1.46e+06u
-M1009 a_1380_303# a_1202_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.541e+11p pd=2.37e+06u as=0p ps=0u
-M1010 a_1202_413# a_27_47# a_700_389# VNB nshort w=360000u l=150000u
-+  ad=1.44e+11p pd=1.52e+06u as=0p ps=0u
-M1011 VPWR a_1757_47# a_1972_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1972_21# a_1757_47# a_2157_47# VNB nshort w=420000u l=150000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1013 VGND a_1972_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.265e+11p ps=4.22e+06u
-M1014 VGND a_1972_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_1380_303# a_1324_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1016 VPWR CLK a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1017 a_618_389# SCE VPWR VPB phighvt w=540000u l=180000u
-+  ad=1.242e+11p pd=1.54e+06u as=0p ps=0u
-M1018 a_1951_413# a_213_47# a_1757_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1019 Q a_1972_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_700_389# D a_618_389# VPB phighvt w=540000u l=180000u
-+  ad=5.193e+11p pd=4.01e+06u as=0p ps=0u
-M1021 a_631_119# a_331_66# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND RESET_B a_1428_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1324_413# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_1972_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1202_413# a_213_47# a_700_389# VPB phighvt w=420000u l=180000u
-+  ad=1.806e+11p pd=1.7e+06u as=0p ps=0u
-M1026 a_1324_413# a_27_47# a_1202_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1866_47# a_27_47# a_1757_47# VNB nshort w=360000u l=150000u
-+  ad=2.121e+11p pd=1.9e+06u as=1.422e+11p ps=1.51e+06u
-M1028 a_1757_47# a_213_47# a_1380_303# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.87e+11p ps=1.93e+06u
-M1029 Q a_1972_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR SCE a_331_66# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=2.214e+11p ps=1.9e+06u
-M1031 VGND CLK a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1032 VGND a_1972_21# a_1866_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_213_47# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1034 a_899_66# SCE a_700_389# VNB nshort w=420000u l=500000u
-+  ad=1.554e+11p pd=1.58e+06u as=0p ps=0u
-M1035 a_1757_47# a_27_47# a_1380_303# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1322_47# a_213_47# a_1202_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR a_1972_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND SCD a_899_66# VNB nshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_870_389# a_331_66# a_700_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND SCE a_331_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1041 a_1380_303# a_1202_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and4b_1 VGND VPWR C A_N X D B VPB VNB
-M1000 a_379_47# B a_307_47# VNB nshort w=420000u l=150000u
-+  ad=2.1e+11p pd=1.84e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR A_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=7.115e+11p pd=6.35e+06u as=1.134e+11p ps=1.38e+06u
-M1002 a_509_47# C a_379_47# VNB nshort w=420000u l=150000u
-+  ad=1.491e+11p pd=1.55e+06u as=0p ps=0u
-M1003 X a_213_413# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=3.422e+11p ps=3.43e+06u
-M1004 VPWR B a_213_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=3.171e+11p ps=3.19e+06u
-M1005 VGND D a_509_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_213_413# a_27_47# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_213_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1008 VGND A_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1009 a_213_413# C VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR D a_213_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_307_47# a_27_47# a_213_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-.ends
-.subckt sky130_fd_sc_hdll__probe_p_8 X A VGND VPWR VPB VNB
-M1000 a_399_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=1.72e+12p ps=1.544e+07u
-M1001 a_27_47# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1002 a_27_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=1.339e+12p ps=1.192e+07u
-M1003 VPWR a_27_47# a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_27_47# a_399_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.02e+11p ps=7.36e+06u
-M1005 VPWR a_27_47# a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_399_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_399_297# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_27_47# a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_27_47# a_399_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_399_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_399_297# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_399_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_399_297# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-R0 a_399_297# X short w=3.02e+06u l=5000u
-M1017 VPWR a_27_47# a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_27_47# a_399_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_399_297# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_27_47# a_399_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o32ai_4 A1 A2 A3 B1 Y B2 VNB VPB VGND VPWR
-M1000 a_27_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.425e+12p pd=1.285e+07u as=1.41e+12p ps=1.282e+07u
-M1001 a_1352_297# A2 a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.205e+12p pd=1.041e+07u as=1.41e+12p ps=1.282e+07u
-M1002 a_27_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1003 a_1352_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=2.75925e+12p pd=2.279e+07u as=8.645e+11p ps=7.86e+06u
-M1005 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.41375e+12p ps=1.215e+07u
-M1007 VPWR B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_886_297# A2 a_1352_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1 a_1352_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A3 a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A3 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1352_297# A2 a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_886_297# A2 a_1352_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_886_297# A3 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1352_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_27_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_27_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A3 a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A1 a_1352_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A3 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_27_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_886_297# A3 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Y B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor3_2 C Y A B VPB VNB VGND VPWR
-M1000 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=8.7e+11p ps=7.74e+06u
-M1001 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=8.6125e+11p pd=9.15e+06u as=7.215e+11p ps=6.12e+06u
-M1002 a_27_297# B a_309_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.3e+11p ps=7.66e+06u
-M1003 a_309_297# C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1004 a_309_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y C a_309_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__xor2_4 X B A VNB VPB VGND VPWR
-M1000 a_27_297# B a_112_47# VPB phighvt w=1e+06u l=180000u
-+  ad=1.425e+12p pd=1.285e+07u as=5.8e+11p ps=5.16e+06u
-M1001 VPWR A a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.74e+12p pd=1.548e+07u as=1.9868e+12p ps=1.798e+07u
-M1002 X B a_886_47# VNB nshort w=650000u l=150000u
-+  ad=8.97e+11p pd=7.96e+06u as=9.295e+11p ps=9.36e+06u
-M1003 a_112_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=8.645e+11p pd=7.86e+06u as=1.97925e+12p ps=1.909e+07u
-M1004 a_886_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_112_47# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_886_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A a_886_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_112_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B a_112_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A a_112_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_886_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_886_297# a_112_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.6245e+11p ps=7.74e+06u
-M1017 X B a_886_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_886_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_112_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_886_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_886_47# B X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_297# B a_112_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_112_47# a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_112_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND B a_112_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR B a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 X a_112_47# a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_112_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A a_112_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND A a_886_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_112_47# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_886_297# a_112_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_886_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 X a_112_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_886_47# B X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND a_112_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_112_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or3b_4 A B C_N X VNB VPB VGND VPWR
-M1000 VPWR a_186_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=8.857e+11p pd=7.87e+06u as=5.8e+11p ps=5.16e+06u
-M1001 X a_186_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=8.635e+11p ps=7.91e+06u
-M1002 a_186_21# A VGND VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=0p ps=0u
-M1003 a_186_21# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_186_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_186_21# a_27_47# a_694_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=3.5e+11p ps=2.7e+06u
-M1006 VGND B a_186_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_186_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_186_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR C_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1010 VGND C_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1011 X a_186_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_186_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_186_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_694_297# B a_600_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1015 a_600_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o21ba_4 B1_N A1 A2 X VNB VPB VGND VPWR
-M1000 VPWR a_197_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.43e+12p pd=1.286e+07u as=5.8e+11p ps=5.16e+06u
-M1001 a_823_297# A2 a_197_21# VPB phighvt w=1e+06u l=180000u
-+  ad=8.5e+11p pd=7.7e+06u as=5.8e+11p ps=5.16e+06u
-M1002 VGND A2 a_635_47# VNB nshort w=650000u l=150000u
-+  ad=1.0335e+12p pd=9.68e+06u as=7.345e+11p ps=7.46e+06u
-M1003 a_635_47# a_27_297# a_197_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1004 VPWR B1_N a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.9e+11p ps=2.78e+06u
-M1005 a_635_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_197_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_197_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1008 a_197_21# A2 a_823_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_197_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_197_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_197_21# a_27_297# a_635_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A1 a_635_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_197_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_197_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_823_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_27_297# a_197_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND B1_N a_27_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.3075e+11p ps=2.01e+06u
-M1018 VPWR A1 a_823_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_635_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_197_21# a_27_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_197_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a31o_1 A2 B1 A1 A3 X VPB VNB VGND VPWR
-M1000 VGND B1 a_80_21# VNB nshort w=650000u l=150000u
-+  ad=4.9075e+11p pd=4.11e+06u as=2.47e+11p ps=2.06e+06u
-M1001 VPWR A2 a_225_297# VPB phighvt w=1e+06u l=180000u
-+  ad=7.05e+11p pd=5.41e+06u as=7e+11p ps=5.4e+06u
-M1002 a_225_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_80_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.55e+06u
-M1004 VGND a_80_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.7225e+11p ps=1.83e+06u
-M1005 a_225_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_323_47# A2 a_217_47# VNB nshort w=650000u l=150000u
-+  ad=2.47e+11p pd=2.06e+06u as=2.47e+11p ps=2.06e+06u
-M1007 a_80_21# A1 a_323_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_217_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_80_21# B1 a_225_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.3e+11p pd=2.66e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__xnor3_1 X B C A VNB VPB VGND VPWR
-M1000 VPWR a_83_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.22595e+12p pd=8.52e+06u as=2.9e+11p ps=2.58e+06u
-M1001 a_901_297# a_783_297# a_375_49# VNB nshort w=600000u l=150000u
-+  ad=4.4975e+11p pd=3.99e+06u as=5.4545e+11p ps=4.31e+06u
-M1002 a_83_21# C a_375_49# VNB nshort w=640000u l=150000u
-+  ad=2.176e+11p pd=1.96e+06u as=0p ps=0u
-M1003 a_1184_297# a_901_297# VGND VNB nshort w=640000u l=150000u
-+  ad=5.677e+11p pd=4.42e+06u as=9.124e+11p ps=6.76e+06u
-M1004 a_783_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.2e+11p pd=2.64e+06u as=0p ps=0u
-M1005 a_901_297# a_783_297# a_351_325# VPB phighvt w=840000u l=180000u
-+  ad=7.226e+11p pd=5.29e+06u as=5.878e+11p ps=4.8e+06u
-M1006 a_351_325# B a_901_297# VNB nshort w=640000u l=150000u
-+  ad=6.091e+11p pd=4.57e+06u as=0p ps=0u
-M1007 a_1184_297# a_901_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=7.998e+11p pd=5.68e+06u as=0p ps=0u
-M1008 a_783_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=1.6515e+11p pd=1.82e+06u as=0p ps=0u
-M1009 VGND A a_901_297# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_375_49# B a_901_297# VPB phighvt w=840000u l=180000u
-+  ad=8.3175e+11p pd=5.4e+06u as=0p ps=0u
-M1011 a_351_325# B a_1184_297# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_83_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.82e+11p ps=1.86e+06u
-M1013 a_351_325# a_226_93# a_83_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A a_901_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_83_21# C a_351_325# VPB phighvt w=840000u l=180000u
-+  ad=3.227e+11p pd=2.67e+06u as=0p ps=0u
-M1016 a_1184_297# a_783_297# a_351_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_226_93# C VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.856e+11p pd=1.86e+06u as=0p ps=0u
-M1018 a_1184_297# a_783_297# a_375_49# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_375_49# B a_1184_297# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_226_93# C VGND VNB nshort w=420000u l=150000u
-+  ad=1.995e+11p pd=1.79e+06u as=0p ps=0u
-M1021 a_375_49# a_226_93# a_83_21# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or4bb_4 D_N B A C_N X VNB VPB VGND VPWR
-M1000 X a_335_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.20363e+12p ps=1.058e+07u
-M1001 a_425_297# a_224_297# a_335_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.5e+11p pd=2.7e+06u as=2.7e+11p ps=2.54e+06u
-M1002 VGND A a_335_297# VNB nshort w=650000u l=150000u
-+  ad=1.2044e+12p pd=1.129e+07u as=4.355e+11p ps=3.94e+06u
-M1003 VPWR A a_625_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1004 a_224_297# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1005 a_335_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_335_297# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1007 VPWR a_335_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND C_N a_27_410# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1009 a_625_297# B a_531_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1010 a_531_297# a_27_410# a_425_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_335_297# a_224_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_27_410# a_335_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_335_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR C_N a_27_410# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1015 X a_335_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_335_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_224_297# D_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1018 VPWR a_335_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_335_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__probec_p_8 X A VGND VPWR VPB VNB
-M1000 a_399_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=1.72e+12p ps=1.544e+07u
-M1001 a_27_47# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1002 a_27_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=1.339e+12p ps=1.192e+07u
-M1003 VPWR a_27_47# a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-R0 X a_399_297# short w=1.6e+06u l=100000u
-M1004 VGND a_27_47# a_399_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.02e+11p ps=7.36e+06u
-M1005 VPWR a_27_47# a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_399_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_399_297# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_27_47# a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_27_47# a_399_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_399_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_399_297# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_399_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_399_297# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-R1 VPWR m5_872_595# short w=0u l=1.2e+06u
-R2 VGND m5_872_n71# short w=0u l=1.2e+06u
-M1017 VPWR a_27_47# a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_27_47# a_399_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_399_297# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_27_47# a_399_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor3b_4 A C_N B Y VPB VNB VGND VPWR
-M1000 VPWR A a_215_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.5e+11p pd=7.7e+06u as=1.16e+12p ps=1.032e+07u
-M1001 VPWR C_N a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1002 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=1.3455e+12p pd=1.194e+07u as=1.6575e+12p ps=1.42e+07u
-M1003 a_605_297# B a_215_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.41e+12p pd=1.282e+07u as=0p ps=0u
-M1004 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.145e+11p ps=1.96e+06u
-M1007 Y a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_215_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_605_297# a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1010 a_215_297# B a_605_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A a_215_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y a_27_47# a_605_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_605_297# B a_215_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_215_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_605_297# a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_215_297# B a_605_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y a_27_47# a_605_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o221ai_4 B1 B2 A2 C1 Y A1 VNB VPB VGND VPWR
-M1000 Y C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.74e+12p pd=1.548e+07u as=2.645e+12p ps=1.929e+07u
-M1001 a_601_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=0p ps=0u
-M1002 Y A2 a_1369_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1003 a_1369_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_511_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.976e+12p pd=1.778e+07u as=7.67e+11p ps=7.56e+06u
-M1005 a_1369_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y C1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=1.391e+12p ps=1.338e+07u
-M1007 a_511_47# B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A1 a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B2 a_601_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_511_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR B1 a_601_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A1 a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A2 a_1369_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_47# C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A2 a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_601_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_511_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y C1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_47# B1 a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1369_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_511_47# B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_601_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR A1 a_1369_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_27_47# B2 a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR B1 a_601_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_511_47# B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y B2 a_601_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_27_47# C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_511_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_511_47# B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_601_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR A1 a_1369_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND A2 a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_27_47# B1 a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1369_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_27_47# B2 a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or2_6 X A B VNB VPB VGND VPWR
-M1000 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.42e+12p pd=1.284e+07u as=8.5e+11p ps=7.7e+06u
-M1001 VGND A a_123_47# VNB nshort w=650000u l=150000u
-+  ad=1.7225e+12p pd=1.31e+07u as=3.51e+11p ps=3.68e+06u
-M1002 X a_123_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=0p ps=0u
-M1003 VGND a_123_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.265e+11p ps=5.52e+06u
-M1004 a_123_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_123_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_297# B a_123_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1007 VPWR a_123_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_123_47# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_123_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_123_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_123_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_123_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B a_123_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_123_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_123_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_123_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_123_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_123_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o31ai_4 A3 A2 A1 Y B1 VGND VPWR VPB VNB
-M1000 VGND A3 a_31_47# VNB nshort w=650000u l=150000u
-+  ad=1.72575e+12p pd=1.311e+07u as=1.729e+12p ps=1.702e+07u
-M1001 a_497_297# A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=1.45e+12p ps=1.29e+07u
-M1002 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=0p ps=0u
-M1003 a_31_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_31_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1005 Y A3 a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.435e+12p pd=1.287e+07u as=0p ps=0u
-M1006 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_497_297# A3 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_31_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 a_31_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_31_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_31_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A1 a_31_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_31_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_297# A2 a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_31_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A3 a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A2 a_31_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y B1 a_31_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A3 a_31_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_497_297# A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A1 a_31_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_31_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_497_297# A3 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_31_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_27_297# A2 a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and3_2 B X A C VPWR VGND VPB VNB
-M1000 VGND a_29_311# X VNB nshort w=650000u l=150000u
-+  ad=5.093e+11p pd=4.31e+06u as=2.21e+11p ps=1.98e+06u
-M1001 VGND C a_194_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.281e+11p ps=1.45e+06u
-M1002 VPWR C a_29_311# VPB phighvt w=420000u l=180000u
-+  ad=8.325e+11p pd=6.94e+06u as=2.7055e+11p ps=3.05e+06u
-M1003 a_29_311# B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_194_53# B a_122_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1005 VPWR a_29_311# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1006 X a_29_311# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_29_311# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_122_53# A a_29_311# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1009 VPWR A a_29_311# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__clkbuf_2 VPB VGND VPWR VNB A X
-M1000 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=2.457e+11p pd=2.85e+06u as=1.323e+11p ps=1.47e+06u
-M1001 VGND a_27_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.554e+11p ps=1.58e+06u
-M1002 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=6.15e+11p pd=5.23e+06u as=2.75e+11p ps=2.55e+06u
-M1003 X a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1005 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__clkinv_2 Y A VNB VPB VPWR VGND
-M1000 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=2.415e+11p pd=2.83e+06u as=1.386e+11p ps=1.5e+06u
-M1001 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.9e+11p pd=5.18e+06u as=5.75e+11p ps=5.15e+06u
-M1002 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sdfstp_2 Q SCD D CLK SET_B SCE VGND VPWR VPB VNB
-M1000 VPWR SET_B a_1229_21# VPB phighvt w=420000u l=180000u
-+  ad=2.0718e+12p pd=1.868e+07u as=1.722e+11p ps=1.66e+06u
-M1001 VGND a_349_21# a_295_47# VNB nshort w=420000u l=150000u
-+  ad=1.50395e+12p pd=1.505e+07u as=1.134e+11p ps=1.38e+06u
-M1002 a_2067_47# a_1951_295# a_1995_47# VNB nshort w=420000u l=150000u
-+  ad=2.016e+11p pd=1.8e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_1745_329# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=4.746e+11p pd=4.26e+06u as=0p ps=0u
-M1004 a_1951_295# a_1745_329# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1005 a_1995_47# a_693_369# a_1745_329# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.332e+11p ps=2.5e+06u
-M1006 a_1891_413# a_877_369# a_1745_329# VPB phighvt w=420000u l=180000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1007 VGND SCE a_349_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1008 a_1075_413# a_877_369# a_201_47# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.99e+11p ps=3.24e+06u
-M1009 VPWR SCD a_27_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=3.456e+11p ps=3.64e+06u
-M1010 a_1229_21# a_1075_413# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR SCE a_349_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1012 VGND SET_B a_2067_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_2447_47# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1014 VGND SET_B a_1467_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1015 a_877_369# a_693_369# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1016 VGND a_1229_21# a_1177_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1017 VPWR a_1951_295# a_1891_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND CLK a_693_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1019 a_1951_295# a_1745_329# VGND VNB nshort w=420000u l=150000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1020 a_1654_47# a_1075_413# VGND VNB nshort w=640000u l=150000u
-+  ad=5.088e+11p pd=2.87e+06u as=0p ps=0u
-M1021 a_1467_47# a_1075_413# a_1229_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.512e+11p ps=1.56e+06u
-M1022 Q a_2447_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_369# a_349_21# a_201_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_119_47# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1025 a_1177_47# a_877_369# a_1075_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1026 VGND a_1745_329# a_2447_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1027 a_877_369# a_693_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1028 a_1663_329# a_1075_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=1.932e+11p pd=2.14e+06u as=0p ps=0u
-M1029 VPWR a_1745_329# a_2447_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1030 a_1075_413# a_693_369# a_201_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1031 a_1745_329# a_693_369# a_1663_329# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_295_47# D a_201_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND a_2447_47# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1034 a_201_47# SCE a_119_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 Q a_2447_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_211_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.472e+11p pd=1.74e+06u as=0p ps=0u
-M1037 a_201_47# D a_211_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1169_413# a_693_369# a_1075_413# VPB phighvt w=420000u l=180000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1039 VPWR a_1229_21# a_1169_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VPWR CLK a_693_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1041 a_1745_329# a_877_369# a_1654_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a211o_1 VNB VPB VGND VPWR X A2 B1 A1 C1
-M1000 a_80_21# C1 a_546_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.75e+11p pd=2.55e+06u as=3.5e+11p ps=2.7e+06u
-M1001 VGND B1 a_80_21# VNB nshort w=650000u l=150000u
-+  ad=8.32e+11p pd=5.16e+06u as=3.8675e+11p ps=3.79e+06u
-M1002 VPWR a_80_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=7.55e+11p pd=5.51e+06u as=2.75e+11p ps=2.55e+06u
-M1003 VGND a_80_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.7225e+11p ps=1.83e+06u
-M1004 a_546_297# B1 a_227_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.75e+11p ps=5.15e+06u
-M1005 VPWR A2 a_227_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_80_21# A1 a_320_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.315e+11p ps=2.32e+06u
-M1007 a_320_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_227_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_80_21# C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor2_8 Y A B VPB VNB VGND VPWR
-M1000 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=1.729e+12p pd=1.572e+07u as=1.7745e+12p ps=1.716e+07u
-M1001 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=2.6e+12p ps=2.32e+07u
-M1002 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=0p ps=0u
-M1004 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a21o_1 A2 A1 B1 X VPWR VGND VPB VNB
-M1000 VGND a_81_21# X VNB nshort w=650000u l=150000u
-+  ad=7.8325e+11p pd=5.01e+06u as=1.69e+11p ps=1.82e+06u
-M1001 a_81_21# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=2.1775e+11p pd=1.97e+06u as=0p ps=0u
-M1002 VPWR A1 a_317_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.7e+11p pd=5.14e+06u as=5.8e+11p ps=5.16e+06u
-M1003 VPWR a_81_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1004 VGND A2 a_416_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.82e+11p ps=1.86e+06u
-M1005 a_317_297# B1 a_81_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1006 a_317_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_416_47# A1 a_81_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__einvn_4 TE_B Z A VGND VPWR VPB VNB
-M1000 VPWR TE_B a_222_309# VPB phighvt w=940000u l=180000u
-+  ad=8.663e+11p pd=7.57e+06u as=1.3752e+12p ps=1.258e+07u
-M1001 a_235_47# A Z VNB nshort w=650000u l=150000u
-+  ad=1.04325e+12p pd=9.71e+06u as=4.16e+11p ps=3.88e+06u
-M1002 Z A a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_222_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_235_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=6.175e+11p ps=5.8e+06u
-M1005 VGND a_27_47# a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR TE_B a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1007 a_222_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1008 a_235_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_235_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Z A a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Z A a_222_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_222_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_27_47# a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR TE_B a_222_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_222_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND TE_B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1017 Z A a_222_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand2_16 Y A B VPB VNB VGND VPWR
-M1000 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=4.89e+12p pd=4.378e+07u as=4.64e+12p ps=4.128e+07u
-M1001 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=1.859e+12p pd=1.612e+07u as=3.0355e+12p ps=3.144e+07u
-M1002 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.924e+12p ps=1.632e+07u
-M1005 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1061 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__buf_16 A X VNB VPB VGND VPWR
-M1000 VPWR a_109_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=3.44e+12p pd=3.088e+07u as=2.32e+12p ps=2.064e+07u
-M1001 VPWR A a_109_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.7e+11p ps=7.74e+06u
-M1002 VPWR a_109_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_109_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_109_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_109_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.6965e+12p pd=1.562e+07u as=2.3855e+12p ps=2.294e+07u
-M1006 VGND a_109_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_109_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_109_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_109_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_109_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_109_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=6.565e+11p pd=5.92e+06u as=0p ps=0u
-M1012 X a_109_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_109_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_109_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_109_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_109_47# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_109_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_109_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_109_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_109_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_109_47# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_109_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_109_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_109_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_109_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_109_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND A a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND a_109_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A a_109_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_109_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 X a_109_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 X a_109_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND a_109_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR a_109_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_109_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_109_47# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_109_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND A a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 X a_109_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 X a_109_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 X a_109_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 X a_109_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a21boi_2 VNB VPB VPWR VGND B1_N A2 A1 Y
-M1000 a_228_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2e+12p pd=1.04e+07u as=7.055e+11p ps=6.57e+06u
-M1001 VPWR A2 a_228_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_228_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_228_297# a_61_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1004 Y A1 a_529_47# VNB nshort w=650000u l=150000u
-+  ad=4.225e+11p pd=3.9e+06u as=1.365e+11p ps=1.72e+06u
-M1005 Y a_61_47# a_228_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_61_47# Y VNB nshort w=650000u l=150000u
-+  ad=8.845e+11p pd=6.71e+06u as=0p ps=0u
-M1007 a_61_47# B1_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.155e+11p pd=1.39e+06u as=0p ps=0u
-M1008 VPWR A1 a_228_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_529_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B1_N a_61_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.47e+11p ps=1.54e+06u
-M1011 a_697_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=0p ps=0u
-M1012 Y a_61_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A2 a_697_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand3_2 A Y B C VNB VPB VGND VPWR
-M1000 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.42e+12p pd=1.284e+07u as=8.7e+11p ps=7.74e+06u
-M1001 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=5.785e+11p pd=5.68e+06u as=2.08e+11p ps=1.94e+06u
-M1002 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND C a_307_47# VNB nshort w=650000u l=150000u
-+  ad=4.03e+11p pd=3.84e+06u as=4.16e+11p ps=3.88e+06u
-M1005 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_307_47# C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_47# B a_307_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_307_47# B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__einvp_1 TE A Z VPWR VGND VPB VNB
-M1000 a_332_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=4.55e+11p pd=2.91e+06u as=8.457e+11p ps=3.79e+06u
-M1001 VPWR TE a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1002 Z A a_204_47# VNB nshort w=650000u l=150000u
-+  ad=2.08e+11p pd=1.94e+06u as=7.0525e+11p ps=3.47e+06u
-M1003 VGND TE a_27_47# VNB nshort w=420000u l=150000u
-+  ad=1.94e+11p pd=1.95e+06u as=1.092e+11p ps=1.36e+06u
-M1004 Z A a_332_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1005 a_204_47# TE VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a32o_4 A3 X B1 B2 A1 A2 VNB VPB VGND VPWR
-M1000 a_79_21# B1 a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=2.36e+12p ps=1.672e+07u
-M1001 a_485_47# A2 a_695_47# VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=5.785e+11p ps=5.68e+06u
-M1002 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.7e+12p pd=1.54e+07u as=5.8e+11p ps=5.16e+06u
-M1003 a_493_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=9.62e+11p ps=9.46e+06u
-M1005 VPWR A3 a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_1194_47# B1 a_79_21# VNB nshort w=650000u l=150000u
-+  ad=6.0775e+11p pd=5.77e+06u as=4.16e+11p ps=3.88e+06u
-M1008 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_493_297# B2 a_79_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_493_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1194_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A1 a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_79_21# B2 a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B2 a_1194_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_695_47# A1 a_79_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_79_21# B1 a_1194_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_493_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_695_47# A2 a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_493_297# B1 a_79_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A3 a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_485_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_79_21# A1 a_695_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A2 a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__mux2_2 VGND VPWR A1 A0 S X VPB VNB
-M1000 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=7.764e+11p pd=7.11e+06u as=2.9e+11p ps=2.58e+06u
-M1001 a_280_21# S VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1002 a_606_369# A0 a_79_21# VPB phighvt w=640000u l=180000u
-+  ad=1.472e+11p pd=1.74e+06u as=1.92e+11p ps=1.88e+06u
-M1003 VPWR S a_606_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_79_21# A0 a_310_47# VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=1.386e+11p ps=1.5e+06u
-M1005 VGND S a_502_47# VNB nshort w=420000u l=150000u
-+  ad=5.551e+11p pd=5.47e+06u as=3.108e+11p ps=2.32e+06u
-M1006 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1007 a_502_47# A1 a_79_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_318_369# a_280_21# VPWR VPB phighvt w=640000u l=180000u
-+  ad=4.992e+11p pd=2.84e+06u as=0p ps=0u
-M1009 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_79_21# A1 a_318_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_310_47# a_280_21# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_280_21# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.155e+11p pd=1.39e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and2b_2 VNB VPB VPWR VGND X B A_N
-M1000 VPWR a_230_413# X VPB phighvt w=1e+06u l=180000u
-+  ad=9.248e+11p pd=7.78e+06u as=4.5e+11p ps=2.9e+06u
-M1001 VPWR A_N a_27_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1002 VGND B a_327_47# VNB nshort w=420000u l=150000u
-+  ad=5.4195e+11p pd=5.38e+06u as=1.344e+11p ps=1.48e+06u
-M1003 VPWR B a_230_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1004 VGND a_230_413# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.12e+11p ps=2.26e+06u
-M1005 a_327_47# a_27_413# a_230_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1006 a_27_413# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1007 X a_230_413# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_230_413# a_27_413# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_230_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sdfrtp_2 RESET_B VGND VPWR VNB VPB Q SCE SCD D CLK
-M1000 a_1428_47# a_1380_303# a_1322_47# VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.518e+11p ps=1.6e+06u
-M1001 a_213_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=1.6198e+12p ps=1.48e+07u
-M1002 Q a_1972_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=2.0598e+12p ps=1.853e+07u
-M1003 VPWR a_1972_21# a_1951_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
-M1004 a_1972_21# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1005 a_2157_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=0p ps=0u
-M1006 VPWR SCD a_870_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=1.971e+11p ps=1.81e+06u
-M1007 a_700_389# D a_631_119# VNB nshort w=420000u l=150000u
-+  ad=3.3215e+11p pd=3.47e+06u as=1.302e+11p ps=1.46e+06u
-M1008 a_1380_303# a_1202_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.541e+11p pd=2.37e+06u as=0p ps=0u
-M1009 a_1202_413# a_27_47# a_700_389# VNB nshort w=360000u l=150000u
-+  ad=1.44e+11p pd=1.52e+06u as=0p ps=0u
-M1010 VPWR a_1757_47# a_1972_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1972_21# a_1757_47# a_2157_47# VNB nshort w=420000u l=150000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1012 VPWR a_1380_303# a_1324_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1013 VPWR CLK a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1014 a_618_389# SCE VPWR VPB phighvt w=540000u l=180000u
-+  ad=1.242e+11p pd=1.54e+06u as=0p ps=0u
-M1015 a_1951_413# a_213_47# a_1757_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1016 VGND a_1972_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1017 a_700_389# D a_618_389# VPB phighvt w=540000u l=180000u
-+  ad=5.193e+11p pd=4.01e+06u as=0p ps=0u
-M1018 a_631_119# a_331_66# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Q a_1972_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND RESET_B a_1428_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1324_413# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1202_413# a_213_47# a_700_389# VPB phighvt w=420000u l=180000u
-+  ad=1.806e+11p pd=1.7e+06u as=0p ps=0u
-M1023 a_1324_413# a_27_47# a_1202_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1866_47# a_27_47# a_1757_47# VNB nshort w=360000u l=150000u
-+  ad=2.121e+11p pd=1.9e+06u as=1.422e+11p ps=1.51e+06u
-M1025 a_1757_47# a_213_47# a_1380_303# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.87e+11p ps=1.93e+06u
-M1026 VPWR SCE a_331_66# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=2.214e+11p ps=1.9e+06u
-M1027 VGND CLK a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1028 VGND a_1972_21# a_1866_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_213_47# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1030 VPWR a_1972_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_899_66# SCE a_700_389# VNB nshort w=420000u l=500000u
-+  ad=1.554e+11p pd=1.58e+06u as=0p ps=0u
-M1032 a_1757_47# a_27_47# a_1380_303# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1322_47# a_213_47# a_1202_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND SCD a_899_66# VNB nshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_870_389# a_331_66# a_700_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND SCE a_331_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1037 a_1380_303# a_1202_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and2_8 X B A VNB VPB VGND VPWR
-M1000 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=2.01e+12p pd=1.802e+07u as=1.16e+12p ps=1.032e+07u
-M1001 VGND B a_293_47# VNB nshort w=650000u l=150000u
-+  ad=1.456e+12p pd=1.228e+07u as=1.82e+11p ps=1.86e+06u
-M1002 VPWR A a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1003 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.02e+11p ps=7.36e+06u
-M1006 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_117_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_293_47# A a_117_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1011 a_117_297# A a_131_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.56e+11p ps=1.78e+06u
-M1012 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_131_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR B a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a22oi_4 A2 B2 A1 B1 Y VNB VPB VGND VPWR
-M1000 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=3.13e+12p pd=2.426e+07u as=1.16e+12p ps=1.032e+07u
-M1001 a_883_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=9.295e+11p pd=9.36e+06u as=8.97e+11p ps=7.96e+06u
-M1002 a_27_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A2 a_883_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=0p ps=0u
-M1005 a_883_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=8.645e+11p ps=7.86e+06u
-M1006 Y B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=9.62e+11p ps=9.46e+06u
-M1009 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A1 a_883_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_883_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A2 a_883_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_883_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y A1 a_883_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__muxb4to1_4 VPB VNB VGND VPWR Z S[0] S[1] D[1] D[2] S[2]
-+ S[3] D[3] D[0]
-M1000 Z a_1430_325# a_1643_311# VPB phighvt w=820000u l=180000u
-+  ad=1.9024e+12p pd=1.776e+07u as=1.2606e+12p ps=1.174e+07u
-M1001 a_1643_311# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.0912e+12p ps=4.808e+07u
-M1002 a_2695_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=3.3176e+12p ps=3.4e+07u
-M1003 VPWR D[0] a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1004 VPWR S[0] a_559_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1005 a_2693_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1006 VPWR D[1] a_1643_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Z S[1] a_1693_66# VNB nshort w=520000u l=150000u
-+  ad=1.1232e+12p pd=1.264e+07u as=7.618e+11p ps=8.38e+06u
-M1008 Z S[2] a_2695_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_2695_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR D[3] a_4219_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1011 Z S[3] a_4269_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1012 a_4269_66# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND D[3] a_4269_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1643_311# a_1430_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_119_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1016 a_1693_66# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND D[1] a_1693_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_559_265# S[0] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR D[2] a_2693_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_3135_265# S[2] VPWR VPB phighvt w=820000u l=180000u
-+  ad=2.378e+11p pd=2.22e+06u as=0p ps=0u
-M1021 VGND D[2] a_2695_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Z S[3] a_4269_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Z S[0] a_119_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND D[0] a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_2693_297# a_3135_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Z S[1] a_1693_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_4219_311# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_119_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1693_66# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_2695_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_4269_66# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_4269_66# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1693_66# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_2695_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR D[3] a_4219_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR S[1] a_1430_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1037 Z S[0] a_119_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1643_311# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_4219_311# a_4006_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_4269_66# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_117_297# a_559_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 Z a_1430_325# a_1643_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 Z a_3135_265# a_2693_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_4006_325# S[3] VPWR VPB phighvt w=820000u l=180000u
-+  ad=2.378e+11p pd=2.22e+06u as=0p ps=0u
-M1046 a_559_265# S[0] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1047 a_2693_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 Z a_4006_325# a_4219_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VGND D[1] a_1693_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 a_1430_325# S[1] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 a_2693_297# a_3135_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VGND D[2] a_2695_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 VGND S[0] a_559_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 VGND D[3] a_4269_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 VPWR D[0] a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 Z a_559_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 a_119_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 VGND S[2] a_3135_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1059 VGND S[3] a_4006_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1060 a_4219_311# a_4006_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1061 VGND S[1] a_1430_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1062 a_3135_265# S[2] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 a_117_297# a_559_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 Z a_3135_265# a_2693_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 VPWR D[1] a_1643_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 a_1643_311# a_1430_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1067 VPWR S[3] a_4006_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1068 Z a_4006_325# a_4219_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 a_1430_325# S[1] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 a_4219_311# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1071 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1072 Z a_559_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1073 VGND D[0] a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1074 VPWR D[2] a_2693_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1075 a_4006_325# S[3] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1076 VPWR S[2] a_3135_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 Z S[2] a_2695_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1078 a_119_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1079 a_1693_66# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o32ai_2 A1 B1 A2 A3 Y B2 VPB VNB VGND VPWR
-M1000 VGND A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=1.0595e+12p pd=7.16e+06u as=1.469e+12p ps=1.232e+07u
-M1001 a_27_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=8.3e+11p pd=7.66e+06u as=5.8e+11p ps=5.16e+06u
-M1002 Y A3 a_525_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.7e+11p ps=7.74e+06u
-M1003 a_27_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.81e+11p ps=4.08e+06u
-M1004 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_807_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.5e+11p pd=7.7e+06u as=5.8e+11p ps=5.16e+06u
-M1007 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_525_297# A2 a_807_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_807_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_807_297# A2 a_525_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_525_297# A3 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A3 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o221a_4 C1 A1 A2 B1 B2 X VNB VPB VGND VPWR
-M1000 a_307_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=7.67e+11p pd=7.56e+06u as=9.945e+11p ps=9.56e+06u
-M1001 VPWR C1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.22e+12p pd=1.644e+07u as=8.7e+11p ps=7.74e+06u
-M1002 a_27_47# C1 a_117_297# VNB nshort w=650000u l=150000u
-+  ad=8.19e+11p pd=7.72e+06u as=2.08e+11p ps=1.94e+06u
-M1003 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1004 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1005 VPWR A1 a_785_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1006 VPWR B1 a_305_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1007 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_117_297# C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A1 a_307_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_305_297# B2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_785_297# A2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_47# B1 a_307_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_307_47# B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_117_297# B2 a_305_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_307_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_117_297# C1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_117_297# A2 a_785_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_305_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_47# B2 a_307_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A2 a_307_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_785_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_307_47# B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or3b_2 A B C_N X VPWR VGND VPB VNB
-M1000 a_448_297# A VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.302e+11p pd=1.46e+06u as=6.164e+11p ps=5.43e+06u
-M1001 X a_186_21# VGND VNB nshort w=650000u l=150000u
-+  ad=3.4125e+11p pd=2.35e+06u as=5.5575e+11p ps=5.52e+06u
-M1002 VGND B a_186_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.268e+11p ps=2.76e+06u
-M1003 a_186_21# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_546_297# B a_448_297# VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1005 a_186_21# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR C_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1007 VPWR a_186_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=4e+11p ps=2.8e+06u
-M1008 a_186_21# a_27_47# a_546_297# VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1009 VGND C_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1010 X a_186_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_186_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__xor2_2 B VPWR VGND X A VPB VNB
-M1000 X B a_510_47# VNB nshort w=650000u l=150000u
-+  ad=5.1675e+11p pd=4.19e+06u as=5.785e+11p ps=5.68e+06u
-M1001 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=9.25e+11p pd=7.85e+06u as=8.45e+11p ps=7.69e+06u
-M1002 VGND A a_112_47# VNB nshort w=650000u l=150000u
-+  ad=1.06925e+12p pd=1.109e+07u as=4.485e+11p ps=3.98e+06u
-M1003 VGND A a_510_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_510_47# B X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_510_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.39e+12p pd=1.278e+07u as=0p ps=0u
-M1006 a_27_297# B a_112_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1007 a_510_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_112_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_112_47# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR B a_510_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_510_297# a_112_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1012 X a_112_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_112_47# a_510_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_112_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND B a_112_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_112_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_510_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_510_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o21ba_2 B1_N A1 X A2 VNB VPB VGND VPWR
-M1000 VPWR a_186_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.3807e+12p pd=8.86e+06u as=3.15e+11p ps=2.63e+06u
-M1001 a_186_21# a_27_93# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.45e+11p pd=2.69e+06u as=0p ps=0u
-M1002 VGND a_186_21# X VNB nshort w=650000u l=150000u
-+  ad=5.66e+11p pd=5.73e+06u as=2.5675e+11p ps=2.09e+06u
-M1003 X a_186_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_518_47# a_27_93# a_186_21# VNB nshort w=650000u l=150000u
-+  ad=4.4525e+11p pd=3.97e+06u as=1.69e+11p ps=1.82e+06u
-M1005 VPWR B1_N a_27_93# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1006 VGND A2 a_518_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_518_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_186_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_621_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.35e+11p ps=2.47e+06u
-M1010 a_621_297# A2 a_186_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B1_N a_27_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-.ends
-.subckt sky130_fd_sc_hdll__or4bb_2 A X B D_N C_N VPWR VGND VPB VNB
-M1000 VPWR A a_614_297# VPB phighvt w=420000u l=180000u
-+  ad=8.59325e+11p pd=7.99e+06u as=1.281e+11p ps=1.45e+06u
-M1001 VGND C_N a_27_410# VNB nshort w=420000u l=150000u
-+  ad=8.121e+11p pd=8.33e+06u as=1.302e+11p ps=1.46e+06u
-M1002 a_336_413# a_216_93# VGND VNB nshort w=420000u l=150000u
-+  ad=2.814e+11p pd=3.02e+06u as=0p ps=0u
-M1003 a_216_93# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1004 VPWR a_336_413# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1005 X a_336_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_532_297# a_27_410# a_426_413# VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=2.514e+11p ps=2.7e+06u
-M1007 VGND A a_336_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_426_413# a_216_93# a_336_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1009 a_614_297# B a_532_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR C_N a_27_410# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1011 a_216_93# D_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1012 a_336_413# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_336_413# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1014 X a_336_413# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_27_410# a_336_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__dlxtn_4 D GATE_N Q VNB VPB VPWR VGND
-M1000 a_709_47# a_211_363# a_609_413# VNB nshort w=360000u l=150000u
-+  ad=1.32e+11p pd=1.49e+06u as=1.008e+11p ps=1.28e+06u
-M1001 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=9.9375e+11p ps=1.015e+07u
-M1002 Q a_774_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.3496e+12p ps=1.283e+07u
-M1003 Q a_774_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=0p ps=0u
-M1004 VPWR GATE_N a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1005 VGND a_774_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_503_369# a_319_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.042e+11p pd=1.98e+06u as=0p ps=0u
-M1007 a_505_47# a_319_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.734e+11p pd=1.72e+06u as=0p ps=0u
-M1008 a_609_413# a_27_47# a_505_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_774_21# a_709_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND D a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1011 VPWR D a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1012 Q a_774_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_774_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_609_413# a_774_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1015 a_703_413# a_27_47# a_609_413# VPB phighvt w=420000u l=180000u
-+  ad=1.533e+11p pd=1.57e+06u as=1.218e+11p ps=1.42e+06u
-M1016 VGND GATE_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1017 VPWR a_609_413# a_774_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1018 a_609_413# a_211_363# a_503_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1020 Q a_774_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_774_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_774_21# a_703_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_774_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand2_8 A B Y VNB VPB VGND VPWR
-M1000 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=2.69e+12p pd=2.338e+07u as=2.32e+12p ps=2.064e+07u
-M1001 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=1.8395e+12p pd=1.736e+07u as=8.645e+11p ps=7.86e+06u
-M1006 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=8.645e+11p pd=7.86e+06u as=0p ps=0u
-M1009 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o21bai_4 Y B1_N A1 A2 VNB VPB VGND VPWR
-M1000 a_621_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.43e+12p pd=1.286e+07u as=1.43e+12p ps=1.286e+07u
-M1001 Y a_33_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=0p ps=0u
-M1002 Y A2 a_621_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A1 a_621_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_245_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.3455e+12p pd=1.324e+07u as=1.1115e+12p ps=9.92e+06u
-M1005 VGND A1 a_245_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_245_47# a_33_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1007 a_245_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B1_N a_33_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1009 a_33_297# B1_N VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1010 VGND A2 a_245_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_33_297# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_621_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y a_33_297# a_245_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y a_33_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_621_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A2 a_621_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_245_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A2 a_245_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_245_47# a_33_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A1 a_245_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_33_297# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A1 a_621_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_245_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y a_33_297# a_245_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_621_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a22o_4 B1 B2 X A2 A1 VNB VPB VGND VPWR
-M1000 a_1008_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=3.835e+11p pd=3.78e+06u as=1.3975e+12p ps=1.08e+07u
-M1001 X a_96_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.43e+12p ps=1.286e+07u
-M1002 VPWR A2 a_524_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.515e+12p ps=1.303e+07u
-M1003 a_96_21# B1 a_524_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1004 VGND A2 a_1008_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_96_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_524_297# B1 a_96_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_96_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1008 VGND a_96_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_616_47# B1 a_96_21# VNB nshort w=650000u l=150000u
-+  ad=3.51e+11p pd=3.68e+06u as=4.81e+11p ps=4.08e+06u
-M1010 a_524_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1008_47# A1 a_96_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_96_21# B2 a_524_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_96_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B2 a_616_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_96_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_96_21# B1 a_616_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A1 a_524_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_96_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_616_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_96_21# A1 a_1008_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_524_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_96_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_524_297# B2 a_96_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__dlygate4sd2_1 A X VPWR VGND VPB VNB
-M1000 a_213_47# a_27_47# VGND VNB nshort w=420000u l=180000u
-+  ad=1.092e+11p pd=1.36e+06u as=4.913e+11p ps=3.91e+06u
-M1001 X a_319_93# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1002 VPWR a_213_47# a_319_93# VPB phighvt w=420000u l=180000u
-+  ad=6.233e+11p pd=4.51e+06u as=1.176e+11p ps=1.4e+06u
-M1003 X a_319_93# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1004 a_213_47# a_27_47# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1005 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1006 VGND a_213_47# a_319_93# VNB nshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1007 VPWR A a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-.ends
-.subckt sky130_fd_sc_hdll__nand4bb_1 C D A_N Y B_N VNB VPB VPWR VGND
-M1000 VPWR B_N a_27_93# VPB phighvt w=420000u l=180000u
-+  ad=1.1325e+12p pd=8.99e+06u as=1.134e+11p ps=1.38e+06u
-M1001 VPWR a_500_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=7e+11p ps=5.4e+06u
-M1002 a_434_47# a_27_93# a_334_47# VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=2.275e+11p ps=2e+06u
-M1003 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_334_47# C a_218_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.795e+11p ps=2.16e+06u
-M1005 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_500_21# a_434_47# VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
-M1007 a_218_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.372e+11p ps=3.45e+06u
-M1008 a_500_21# A_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1009 Y a_27_93# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_500_21# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.533e+11p pd=1.57e+06u as=0p ps=0u
-M1011 VGND B_N a_27_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-.ends
-.subckt sky130_fd_sc_hdll__clkbuf_12 A X VPB VNB VGND VPWR
-M1000 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=2.57e+12p pd=2.314e+07u as=1.74e+12p ps=1.548e+07u
-M1001 X a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=6.804e+11p pd=8.28e+06u as=1.3482e+12p ps=1.398e+07u
-M1002 VPWR A a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1003 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_117_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A a_117_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.268e+11p ps=2.76e+06u
-M1010 X a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_117_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_117_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_117_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_117_297# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_117_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_117_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND A a_117_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 X a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_117_297# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor3b_2 C_N Y A B VPB VNB VGND VPWR
-M1000 Y a_571_21# a_309_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=8.7e+11p ps=7.74e+06u
-M1001 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=4.034e+11p pd=3.96e+06u as=8.7e+11p ps=7.74e+06u
-M1002 VGND C_N a_571_21# VNB nshort w=420000u l=150000u
-+  ad=1.0662e+12p pd=1.084e+07u as=1.092e+11p ps=1.36e+06u
-M1003 a_27_297# B a_309_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_309_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_571_21# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=6.89e+11p ps=6.02e+06u
-M1006 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y a_571_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR C_N a_571_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1010 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_309_297# a_571_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__muxb16to1_1 Z VGND VPWR VNB VPB D[0] S[12] S[13] S[8] S[9]
-+ S[10] S[11] S[14] S[15] D[12] D[9] D[10] D[13] D[14] D[15] D[8] D[11] S[0] S[1]
-+ D[1] D[2] S[2] S[3] D[4] S[4] S[5] D[5] D[6] S[6] S[7] D[7] D[3]
-M1000 Z a_1012_793# a_945_591# VPB phighvt w=820000u l=180000u
-+  ad=3.5424e+12p pd=3.488e+07u as=3.297e+11p ps=2.69e+06u
-M1001 a_1765_47# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=3.7518e+12p ps=3.424e+07u
-M1002 a_937_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1003 a_2593_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1004 Z a_2668_793# a_2601_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=3.297e+11p ps=2.69e+06u
-M1005 a_1773_297# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=6.38e+12p ps=4.876e+07u
-M1006 a_1773_591# D[12] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1007 VGND S[6] a_2668_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1008 a_2390_591# a_2189_937# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1009 a_1361_47# S[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1010 VPWR D[7] a_3218_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.297e+11p ps=2.69e+06u
-M1011 a_937_911# D[10] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1012 a_1361_937# S[11] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1013 VPWR D[15] a_3218_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.297e+11p ps=2.69e+06u
-M1014 Z a_1840_265# a_1773_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1574_47# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=2.1632e+12p ps=2.496e+07u
-M1016 a_2402_937# S[13] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1017 a_734_333# a_533_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1018 Z S[2] a_937_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_3017_47# S[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1020 a_2402_47# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1021 a_3017_937# S[15] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1022 a_1562_333# a_1361_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1023 a_746_47# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1024 VGND S[12] a_1840_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1025 a_109_911# D[8] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1026 VGND S[14] a_2668_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1027 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1028 VPWR D[3] a_1562_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_2601_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1030 Z S[4] a_1765_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_533_937# S[9] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1032 a_117_591# D[8] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1033 VPWR D[11] a_1562_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.297e+11p ps=2.69e+06u
-M1034 VGND D[15] a_3230_937# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.95e+06u
-M1035 a_2601_591# D[14] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Z a_184_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1765_911# D[12] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1038 a_3218_591# a_3017_937# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_533_47# S[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1040 a_945_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1041 Z a_1012_265# a_945_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_533_937# S[9] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1043 VGND D[11] a_1574_937# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.95e+06u
-M1044 a_945_591# D[10] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VPWR S[0] a_184_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1046 a_2189_47# S[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1047 a_746_937# S[9] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1048 VPWR S[8] a_184_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1049 a_2189_937# S[13] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1050 VPWR S[2] a_1012_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1051 Z a_2668_265# a_2601_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 a_1361_47# S[3] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1053 VPWR S[10] a_1012_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1054 a_3230_937# S[15] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 a_533_47# S[1] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1056 Z S[8] a_109_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 VGND D[9] a_746_937# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 VGND S[0] a_184_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1059 a_2390_333# a_2189_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1060 a_3230_47# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1061 a_1361_937# S[11] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1062 VGND D[1] a_746_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 Z S[6] a_2593_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 Z a_1840_793# a_1773_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 Z S[10] a_937_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 VPWR S[6] a_2668_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1067 VGND S[8] a_184_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1068 a_1574_937# S[11] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 Z S[12] a_1765_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 a_2189_937# S[13] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1071 a_734_591# a_533_937# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1072 VPWR S[14] a_2668_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1073 a_3017_937# S[15] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1074 a_1562_591# a_1361_937# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1075 VPWR D[1] a_734_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1076 VPWR D[9] a_734_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 VPWR D[5] a_2390_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1078 a_2189_47# S[5] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1079 VPWR D[13] a_2390_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1080 VPWR S[4] a_1840_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1081 VGND D[3] a_1574_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1082 VGND S[10] a_1012_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1083 a_2593_911# D[14] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1084 Z S[14] a_2593_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1085 VPWR S[12] a_1840_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1086 a_109_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1087 VGND D[5] a_2402_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1088 VGND S[2] a_1012_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1089 VGND D[7] a_3230_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1090 Z a_184_793# a_117_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1091 VGND D[13] a_2402_937# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1092 Z S[0] a_109_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1093 a_3218_333# a_3017_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1094 VGND S[4] a_1840_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1095 a_3017_47# S[7] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o221ai_2 B1 B2 Y A2 A1 C1 VNB VPB VGND VPWR
-M1000 VPWR B1 a_410_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.745e+12p pd=1.149e+07u as=5.8e+11p ps=5.16e+06u
-M1001 VGND A2 a_320_47# VNB nshort w=650000u l=150000u
-+  ad=3.835e+11p pd=3.78e+06u as=1.1115e+12p ps=9.92e+06u
-M1002 Y C1 a_28_47# VNB nshort w=650000u l=150000u
-+  ad=2.08e+11p pd=1.94e+06u as=7.54e+11p ps=7.52e+06u
-M1003 a_28_47# B1 a_320_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_410_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.7e+11p ps=7.74e+06u
-M1005 a_802_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1006 Y C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_320_47# B2 a_28_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B2 a_410_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A1 a_320_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_410_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_802_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_320_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_28_47# C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_320_47# B1 a_28_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_28_47# B2 a_320_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_802_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_320_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A2 a_802_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__ebufn_1 Z TE_B A VNB VPB VPWR VGND
-M1000 Z a_27_47# a_543_47# VNB nshort w=650000u l=150000u
-+  ad=3.055e+11p pd=2.24e+06u as=1.365e+11p ps=1.72e+06u
-M1001 VPWR A a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=4.656e+11p pd=4.42e+06u as=1.728e+11p ps=1.82e+06u
-M1002 a_543_47# a_211_369# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.6525e+11p ps=3.83e+06u
-M1003 a_411_297# TE_B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.8e+11p pd=3.76e+06u as=0p ps=0u
-M1004 Z a_27_47# a_411_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.95e+11p pd=2.79e+06u as=0p ps=0u
-M1005 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1006 a_211_369# TE_B VGND VNB nshort w=420000u l=150000u
-+  ad=2.814e+11p pd=2.18e+06u as=0p ps=0u
-M1007 a_211_369# TE_B VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or2_4 X A B VNB VPB VGND VPWR
-M1000 VGND a_35_297# X VNB nshort w=650000u l=150000u
-+  ad=8.4175e+11p pd=7.79e+06u as=4.485e+11p ps=3.98e+06u
-M1001 VPWR A a_129_297# VPB phighvt w=1e+06u l=180000u
-+  ad=9.55e+11p pd=7.91e+06u as=2.3e+11p ps=2.46e+06u
-M1002 X a_35_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1003 a_129_297# B a_35_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1004 VGND A a_35_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1005 X a_35_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_35_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_35_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_35_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_35_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_35_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_35_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a21oi_4 B1 A2 A1 Y VNB VPB VGND VPWR
-M1000 VPWR A1 a_28_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.21e+12p pd=1.042e+07u as=2.075e+12p ps=1.815e+07u
-M1001 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=1.014e+12p pd=9.62e+06u as=9.23e+11p ps=8.04e+06u
-M1002 VPWR A2 a_28_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A1 a_28_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_502_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=8.255e+11p pd=7.74e+06u as=0p ps=0u
-M1006 Y B1 a_28_297# VPB phighvt w=1e+06u l=180000u
-+  ad=6e+11p pd=5.2e+06u as=0p ps=0u
-M1007 a_28_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_502_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 a_28_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_502_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_28_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A2 a_502_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A1 a_502_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_502_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_28_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_28_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A1 a_502_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_28_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_28_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A2 a_28_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_502_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o31ai_2 A1 Y B1 A3 A2 VGND VPWR VPB VNB
-M1000 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=7e+11p pd=5.4e+06u as=8.5e+11p ps=7.7e+06u
-M1001 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.5e+11p ps=7.7e+06u
-M1002 a_27_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=1.01075e+12p pd=9.61e+06u as=1.0075e+12p ps=7e+06u
-M1003 VGND A3 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A3 a_309_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1006 a_27_297# A2 a_309_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=2.86e+11p pd=2.18e+06u as=0p ps=0u
-M1008 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_309_297# A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_309_297# A3 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o211a_4 A1 X C1 A2 B1 VNB VPB VGND VPWR
-M1000 a_524_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=8.0275e+11p pd=7.67e+06u as=1.06925e+12p ps=9.79e+06u
-M1001 a_80_21# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.09e+12p pd=8.18e+06u as=1.795e+12p ps=1.559e+07u
-M1002 VPWR B1 a_80_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A2 a_524_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR C1 a_80_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_80_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=6e+11p ps=5.2e+06u
-M1006 a_80_21# A2 a_1010_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3e+11p ps=2.6e+06u
-M1007 a_524_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_524_47# B1 a_818_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.5275e+11p ps=1.77e+06u
-M1009 X a_80_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=0p ps=0u
-M1010 VPWR a_80_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_1202_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3e+11p ps=2.6e+06u
-M1012 X a_80_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_80_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_80_21# C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_607_47# B1 a_524_47# VNB nshort w=650000u l=150000u
-+  ad=1.365e+11p pd=1.72e+06u as=0p ps=0u
-M1016 VGND A1 a_524_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_80_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1010_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_80_21# C1 a_607_47# VNB nshort w=650000u l=150000u
-+  ad=3.5425e+11p pd=2.39e+06u as=0p ps=0u
-M1020 a_1202_297# A2 a_80_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_80_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_80_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_818_47# C1 a_80_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__einvn_2 TE_B A Z VPWR VGND VPB VNB
-M1000 VPWR TE_B a_222_309# VPB phighvt w=940000u l=180000u
-+  ad=5.526e+11p pd=4.99e+06u as=5.626e+11p ps=5.04e+06u
-M1001 VPWR TE_B a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1002 a_222_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_234_47# A Z VNB nshort w=650000u l=150000u
-+  ad=6.5975e+11p pd=5.93e+06u as=2.08e+11p ps=1.94e+06u
-M1004 VGND TE_B a_27_47# VNB nshort w=420000u l=150000u
-+  ad=2.847e+11p pd=3.2e+06u as=1.302e+11p ps=1.46e+06u
-M1005 a_234_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_27_47# a_234_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Z A a_222_309# VPB phighvt w=1e+06u l=180000u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1008 Z A a_234_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_222_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sdfsbp_1 SCD CLK Q_N D Q VPWR VGND SET_B SCE VPB VNB
-M1000 VGND a_349_21# a_295_47# VNB nshort w=420000u l=150000u
-+  ad=1.4601e+12p pd=1.494e+07u as=1.134e+11p ps=1.38e+06u
-M1001 a_1930_295# a_1735_329# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1002 Q a_2632_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=1.9705e+12p ps=1.846e+07u
-M1003 a_1930_295# a_1735_329# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1004 a_1075_413# a_877_369# a_199_47# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.99e+11p ps=3.24e+06u
-M1005 VGND SCE a_349_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1006 a_1735_329# a_877_369# a_1655_47# VNB nshort w=640000u l=150000u
-+  ad=3.054e+11p pd=2.42e+06u as=4.736e+11p ps=2.76e+06u
-M1007 VPWR SCD a_27_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=3.456e+11p ps=3.64e+06u
-M1008 a_1219_21# a_1075_413# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.701e+11p pd=1.65e+06u as=0p ps=0u
-M1009 a_1870_413# a_877_369# a_1735_329# VPB phighvt w=420000u l=180000u
-+  ad=1.302e+11p pd=1.46e+06u as=4.305e+11p ps=4.05e+06u
-M1010 a_1655_47# a_1075_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Q a_2632_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1012 VPWR SCE a_349_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1013 a_1735_329# a_693_369# a_1652_329# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=1.974e+11p ps=2.15e+06u
-M1014 a_1735_329# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND CLK a_693_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1016 a_877_369# a_693_369# VGND VNB nshort w=420000u l=150000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1017 VPWR a_1930_295# a_1870_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1467_47# a_1075_413# a_1219_21# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.512e+11p ps=1.56e+06u
-M1019 a_27_369# a_349_21# a_199_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR SET_B a_1219_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1177_47# a_877_369# a_1075_413# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.344e+11p ps=1.48e+06u
-M1022 VGND SET_B a_1467_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_877_369# a_693_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1024 a_199_47# SCE a_109_47# VNB nshort w=420000u l=150000u
-+  ad=2.688e+11p pd=2.96e+06u as=1.26e+11p ps=1.44e+06u
-M1025 VGND a_1219_21# a_1177_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Q_N a_1735_329# VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
-M1027 a_1075_413# a_693_369# a_199_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_295_47# D a_199_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1652_329# a_1075_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_1735_329# a_2632_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1031 a_211_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.472e+11p pd=1.74e+06u as=0p ps=0u
-M1032 Q_N a_1735_329# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1033 a_109_47# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_2049_47# a_1930_295# a_1977_47# VNB nshort w=420000u l=150000u
-+  ad=2.688e+11p pd=2.12e+06u as=8.82e+10p ps=1.26e+06u
-M1035 VGND a_1735_329# a_2632_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1036 a_199_47# D a_211_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1169_413# a_693_369# a_1075_413# VPB phighvt w=420000u l=180000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1038 VPWR a_1219_21# a_1169_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND SET_B a_2049_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VPWR CLK a_693_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1041 a_1977_47# a_693_369# a_1735_329# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or4_1 C A X B D VPWR VGND VPB VNB
-M1000 a_27_297# D VGND VNB nshort w=420000u l=150000u
-+  ad=3.15e+11p pd=3.18e+06u as=4.7985e+11p ps=4.92e+06u
-M1001 X a_27_297# VGND VNB nshort w=650000u l=150000u
-+  ad=2.73e+11p pd=2.14e+06u as=0p ps=0u
-M1002 VGND A a_27_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_117_297# D a_27_297# VPB phighvt w=420000u l=180000u
-+  ad=1.47e+11p pd=1.54e+06u as=1.134e+11p ps=1.38e+06u
-M1004 VPWR A a_307_297# VPB phighvt w=420000u l=180000u
-+  ad=3.107e+11p pd=2.72e+06u as=1.428e+11p ps=1.52e+06u
-M1005 VGND C a_27_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_307_297# B a_223_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 a_27_297# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_27_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=4.3e+11p pd=2.86e+06u as=0p ps=0u
-M1009 a_223_297# C a_117_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__inputiso0n_1 VPWR VGND X SLEEP_B A VPB VNB
-M1000 X a_27_75# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.7e+11p pd=2.74e+06u as=4.691e+11p ps=4.24e+06u
-M1001 X a_27_75# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=2.446e+11p ps=2.18e+06u
-M1002 a_27_75# A VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1003 VGND SLEEP_B a_123_75# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1004 VPWR SLEEP_B a_27_75# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_123_75# A a_27_75# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
-.ends
-.subckt sky130_fd_sc_hdll__and4bb_1 VNB VPB VGND VPWR A_N D X C B_N
-M1000 a_425_93# a_27_47# a_339_93# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.176e+11p ps=1.4e+06u
-M1001 a_615_93# C a_511_93# VNB nshort w=420000u l=150000u
-+  ad=1.89e+11p pd=1.74e+06u as=1.554e+11p ps=1.58e+06u
-M1002 a_339_93# C VPWR VPB phighvt w=420000u l=180000u
-+  ad=2.814e+11p pd=3.02e+06u as=6.779e+11p ps=7.03e+06u
-M1003 a_511_93# a_225_413# a_425_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_225_413# B_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1005 VPWR a_225_413# a_339_93# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR D a_339_93# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_225_413# B_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=3.861e+11p ps=3.65e+06u
-M1008 VGND A_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1009 VGND D a_615_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_339_93# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1011 VPWR A_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
-M1012 a_339_93# a_27_47# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_339_93# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__clkinvlp_4 A Y VNB VPB VPWR VGND
-M1000 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.4e+11p pd=5.08e+06u as=7.9e+11p ps=7.58e+06u
-M1001 Y A a_110_47# VNB nshort w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=1.155e+11p ps=1.52e+06u
-M1002 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_110_47# A VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=2.8875e+11p ps=3.25e+06u
-M1004 VGND A a_268_47# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.52e+06u
-M1005 a_268_47# A Y VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a32o_2 B2 X A2 A3 A1 B1 VNB VPB VGND VPWR
-M1000 X a_21_199# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=1.01e+12p ps=8.02e+06u
-M1001 VGND a_21_199# X VNB nshort w=650000u l=150000u
-+  ad=8.5475e+11p pd=6.53e+06u as=2.08e+11p ps=1.94e+06u
-M1002 VPWR A1 a_319_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.5e+11p ps=7.7e+06u
-M1003 VPWR a_21_199# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_21_199# B1 a_382_47# VNB nshort w=650000u l=150000u
-+  ad=2.47e+11p pd=2.06e+06u as=2.3075e+11p ps=2.01e+06u
-M1005 a_319_297# B1 a_21_199# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1006 VPWR A3 a_319_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_589_47# A1 a_21_199# VNB nshort w=650000u l=150000u
-+  ad=3.445e+11p pd=2.36e+06u as=0p ps=0u
-M1008 a_21_199# B2 a_319_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_21_199# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_725_47# A2 a_589_47# VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=0p ps=0u
-M1011 a_319_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_382_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A3 a_725_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand3b_1 B C A_N Y VPB VNB VGND VPWR
-M1000 VPWR A_N a_53_93# VPB phighvt w=420000u l=180000u
-+  ad=6.057e+11p pd=5.31e+06u as=1.134e+11p ps=1.38e+06u
-M1001 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.9e+11p ps=5.18e+06u
-M1002 a_348_47# B a_252_47# VNB nshort w=650000u l=150000u
-+  ad=2.1125e+11p pd=1.95e+06u as=2.145e+11p ps=1.96e+06u
-M1003 VGND A_N a_53_93# VNB nshort w=420000u l=150000u
-+  ad=2.33e+11p pd=2.07e+06u as=1.302e+11p ps=1.46e+06u
-M1004 Y a_53_93# a_348_47# VNB nshort w=650000u l=150000u
-+  ad=1.8525e+11p pd=1.87e+06u as=0p ps=0u
-M1005 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_252_47# C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_53_93# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and2_6 X B A VNB VPB VGND VPWR
-M1000 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.72e+12p pd=1.544e+07u as=8.7e+11p ps=7.74e+06u
-M1001 VGND B a_293_47# VNB nshort w=650000u l=150000u
-+  ad=1.2155e+12p pd=1.024e+07u as=1.82e+11p ps=1.86e+06u
-M1002 VPWR A a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1003 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.265e+11p ps=5.52e+06u
-M1005 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_117_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_293_47# A a_117_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1009 a_117_297# A a_131_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.56e+11p ps=1.78e+06u
-M1010 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_131_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR B a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a22oi_2 A1 A2 B1 B2 Y VPWR VGND VPB VNB
-M1000 Y B2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.3e+11p pd=7.66e+06u as=1.51e+12p ps=1.302e+07u
-M1001 a_27_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=5.46e+11p pd=5.58e+06u as=4.485e+11p ps=3.98e+06u
-M1002 a_507_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=6.11e+11p pd=5.78e+06u as=4.485e+11p ps=3.98e+06u
-M1003 a_117_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1004 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_507_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A1 a_507_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_117_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_117_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A2 a_507_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_117_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__muxb4to1_2 VGND VPWR Z VNB VPB S[1] S[2] S[3] D[1] D[0]
-+ D[2] D[3] S[0]
-M1000 VPWR D[2] a_1315_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.88e+12p pd=1.576e+07u as=8.211e+11p ps=7.41e+06u
-M1001 VPWR D[3] a_2112_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1002 a_27_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1003 Z a_1566_265# a_1315_297# VPB phighvt w=820000u l=180000u
-+  ad=9.512e+11p pd=8.88e+06u as=0p ps=0u
-M1004 Z a_1989_47# a_2112_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_297# a_278_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR S[0] a_278_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1007 a_1989_47# S[3] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=9.828e+11p ps=1.052e+07u
-M1008 a_2133_69# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1009 Z a_278_265# a_27_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_845_69# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=5.616e+11p ps=6.32e+06u
-M1011 a_27_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1012 Z S[1] a_845_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Z S[0] a_27_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_824_333# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1016 a_1989_47# S[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1017 VPWR D[0] a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_701_47# S[1] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1019 VGND D[1] a_845_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_824_333# a_701_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND S[0] a_278_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1022 a_701_47# S[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1023 VPWR D[1] a_824_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_845_69# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Z S[3] a_2133_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND D[0] a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Z a_701_47# a_824_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1315_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1029 Z S[2] a_1315_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1315_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1315_297# a_1566_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_2112_333# a_1989_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND D[2] a_1315_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_2133_69# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR S[2] a_1566_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1036 a_2112_333# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1315_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND S[2] a_1566_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1039 VGND D[3] a_2133_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sdfrbp_1 RESET_B VPWR VGND VNB VPB Q_N D CLK Q SCE SCD
-M1000 a_1428_47# a_1380_303# a_1322_47# VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.518e+11p ps=1.6e+06u
-M1001 a_213_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=1.5405e+12p ps=1.444e+07u
-M1002 VPWR a_1972_21# a_1951_413# VPB phighvt w=420000u l=180000u
-+  ad=1.88075e+12p pd=1.788e+07u as=1.386e+11p ps=1.5e+06u
-M1003 a_1972_21# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1004 Q a_1972_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.15e+11p pd=2.63e+06u as=0p ps=0u
-M1005 a_2157_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=0p ps=0u
-M1006 VPWR SCD a_870_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=1.971e+11p ps=1.81e+06u
-M1007 a_700_389# D a_631_119# VNB nshort w=420000u l=150000u
-+  ad=3.3215e+11p pd=3.47e+06u as=1.302e+11p ps=1.46e+06u
-M1008 a_1380_303# a_1202_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.541e+11p pd=2.37e+06u as=0p ps=0u
-M1009 a_1202_413# a_27_47# a_700_389# VNB nshort w=360000u l=150000u
-+  ad=1.44e+11p pd=1.52e+06u as=0p ps=0u
-M1010 VPWR a_1757_47# a_1972_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1972_21# a_1757_47# a_2157_47# VNB nshort w=420000u l=150000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1012 Q a_1972_21# VGND VNB nshort w=650000u l=150000u
-+  ad=1.9825e+11p pd=1.91e+06u as=0p ps=0u
-M1013 VPWR a_1380_303# a_1324_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1014 VPWR a_1972_21# a_2580_47# VPB phighvt w=790000u l=180000u
-+  ad=0p pd=0u as=2.133e+11p ps=2.12e+06u
-M1015 VPWR CLK a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1016 a_618_389# SCE VPWR VPB phighvt w=540000u l=180000u
-+  ad=1.242e+11p pd=1.54e+06u as=0p ps=0u
-M1017 a_1951_413# a_213_47# a_1757_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1018 VGND a_1972_21# a_2580_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1019 a_700_389# D a_618_389# VPB phighvt w=540000u l=180000u
-+  ad=5.193e+11p pd=4.01e+06u as=0p ps=0u
-M1020 a_631_119# a_331_66# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND RESET_B a_1428_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1324_413# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1202_413# a_213_47# a_700_389# VPB phighvt w=420000u l=180000u
-+  ad=1.806e+11p pd=1.7e+06u as=0p ps=0u
-M1024 a_1324_413# a_27_47# a_1202_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1866_47# a_27_47# a_1757_47# VNB nshort w=360000u l=150000u
-+  ad=2.121e+11p pd=1.9e+06u as=1.422e+11p ps=1.51e+06u
-M1026 a_1757_47# a_213_47# a_1380_303# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.87e+11p ps=1.93e+06u
-M1027 VPWR SCE a_331_66# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=2.214e+11p ps=1.9e+06u
-M1028 VGND CLK a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1029 VGND a_1972_21# a_1866_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_213_47# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1031 Q_N a_2580_47# VGND VNB nshort w=520000u l=150000u
-+  ad=1.456e+11p pd=1.6e+06u as=0p ps=0u
-M1032 a_899_66# SCE a_700_389# VNB nshort w=420000u l=500000u
-+  ad=1.554e+11p pd=1.58e+06u as=0p ps=0u
-M1033 Q_N a_2580_47# VPWR VPB phighvt w=790000u l=180000u
-+  ad=2.291e+11p pd=2.16e+06u as=0p ps=0u
-M1034 a_1757_47# a_27_47# a_1380_303# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1322_47# a_213_47# a_1202_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND SCD a_899_66# VNB nshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_870_389# a_331_66# a_700_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND SCE a_331_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1039 a_1380_303# a_1202_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o221a_2 B2 A2 X B1 C1 A1 VPB VNB VGND VPWR
-M1000 a_255_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.45e+11p pd=2.49e+06u as=9.7e+11p ps=7.94e+06u
-M1001 a_245_47# B1 a_151_47# VNB nshort w=650000u l=150000u
-+  ad=3.9325e+11p pd=3.81e+06u as=3.9975e+11p ps=3.83e+06u
-M1002 a_151_47# C1 a_38_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.6975e+11p ps=2.13e+06u
-M1003 a_151_47# B2 a_245_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A1 a_245_47# VNB nshort w=650000u l=150000u
-+  ad=5.46e+11p pd=5.58e+06u as=0p ps=0u
-M1005 VPWR A1 a_535_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.3e+11p ps=2.46e+06u
-M1006 a_535_297# A2 a_38_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.13e+12p ps=6.26e+06u
-M1007 VPWR C1 a_38_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_245_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_38_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1010 a_38_47# B2 a_255_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_38_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.405e+11p ps=2.04e+06u
-M1012 X a_38_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_38_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__dlxtn_2 D GATE_N Q VNB VPB VPWR VGND
-M1000 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=7.76e+11p ps=8.18e+06u
-M1001 a_718_47# a_211_363# a_608_413# VNB nshort w=360000u l=150000u
-+  ad=1.32e+11p pd=1.49e+06u as=1.35e+11p ps=1.47e+06u
-M1002 VPWR GATE_N a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=1.0446e+12p pd=1.022e+07u as=1.728e+11p ps=1.82e+06u
-M1003 a_503_369# a_319_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=0p ps=0u
-M1004 VPWR a_783_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1005 a_739_413# a_27_47# a_608_413# VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=1.995e+11p ps=1.79e+06u
-M1006 a_505_47# a_319_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.554e+11p pd=1.62e+06u as=0p ps=0u
-M1007 VGND a_783_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1008 Q a_783_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND D a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1010 VPWR D a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1011 VGND a_783_21# a_718_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Q a_783_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_608_413# a_27_47# a_505_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_608_413# a_783_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1015 VGND GATE_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1016 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1017 VPWR a_608_413# a_783_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1018 a_608_413# a_211_363# a_503_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_783_21# a_739_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a22o_2 A1 A2 X B2 B1 VPWR VGND VPB VNB
-M1000 a_27_297# B1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=6.4e+11p ps=5.28e+06u
-M1001 X a_27_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=1.01e+12p ps=8.02e+06u
-M1002 VGND a_27_297# X VNB nshort w=650000u l=150000u
-+  ad=6.955e+11p pd=6.04e+06u as=2.08e+11p ps=1.94e+06u
-M1003 VPWR A2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_27_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_117_297# B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_411_47# A1 a_27_297# VNB nshort w=650000u l=150000u
-+  ad=2.47e+11p pd=2.06e+06u as=4.03e+11p ps=3.84e+06u
-M1007 VGND A2 a_411_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_117_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_119_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.495e+11p pd=1.76e+06u as=0p ps=0u
-M1010 a_27_297# B1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_27_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand2_6 Y A B VPB VNB VGND VPWR
-M1000 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.99e+12p pd=1.798e+07u as=1.74e+12p ps=1.548e+07u
-M1001 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=1.248e+12p pd=1.294e+07u as=7.215e+11p ps=6.12e+06u
-M1003 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=6.89e+11p pd=6.02e+06u as=0p ps=0u
-M1006 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o21bai_2 B1_N Y A2 A1 VNB VPB VGND VPWR
-M1000 a_226_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=8.0925e+11p pd=7.69e+06u as=6.112e+11p ps=5.54e+06u
-M1001 a_226_47# a_28_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1002 Y a_28_297# a_226_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_28_297# B1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1004 VPWR B1_N a_28_297# VPB phighvt w=420000u l=180000u
-+  ad=8.657e+11p pd=7.83e+06u as=1.134e+11p ps=1.38e+06u
-M1005 VPWR a_28_297# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1006 a_226_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_437_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.5e+11p pd=7.7e+06u as=0p ps=0u
-M1008 VGND A1 a_226_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_28_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1 a_437_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_437_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A2 a_226_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A2 a_437_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o21a_4 A1 A2 B1 X VNB VPB VPWR VGND
-M1000 X a_80_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6e+11p pd=5.2e+06u as=1.76e+12p ps=1.352e+07u
-M1001 a_80_21# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6.5e+11p pd=5.3e+06u as=0p ps=0u
-M1002 X a_80_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_525_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=8.84e+11p pd=7.92e+06u as=1.0075e+12p ps=9.6e+06u
-M1004 a_80_21# A2 a_826_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.5e+11p ps=2.5e+06u
-M1005 X a_80_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.29e+11p pd=3.92e+06u as=0p ps=0u
-M1006 VGND a_80_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_525_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A1 a_1008_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3e+11p ps=2.6e+06u
-M1009 X a_80_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_80_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B1 a_80_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_525_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_525_47# B1 a_80_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1014 a_826_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_80_21# B1 a_525_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A1 a_525_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_80_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_80_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1008_297# A2 a_80_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a21oi_2 B1 A2 A1 Y VNB VPB VGND VPWR
-M1000 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.9e+11p pd=5.18e+06u as=1.25e+12p ps=1.05e+07u
-M1001 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=7.54e+11p pd=6.22e+06u as=4.55e+11p ps=4e+06u
-M1003 a_123_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.82e+11p pd=1.86e+06u as=0p ps=0u
-M1004 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_315_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=1.365e+11p pd=1.72e+06u as=0p ps=0u
-M1006 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_315_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A1 a_123_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1010 Y B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or2_2 B X A VPWR VGND VPB VNB
-M1000 VPWR A a_129_297# VPB phighvt w=420000u l=180000u
-+  ad=5.957e+11p pd=5.29e+06u as=9.66e+10p ps=1.3e+06u
-M1001 X a_39_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1002 a_129_297# B a_39_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1003 VGND A a_39_297# VNB nshort w=420000u l=150000u
-+  ad=5.337e+11p pd=5.39e+06u as=1.134e+11p ps=1.38e+06u
-M1004 VGND a_39_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.405e+11p ps=2.04e+06u
-M1005 X a_39_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_39_297# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_39_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__decap_12 VGND VPWR VPB VNB
-M1000 VPWR VGND VPWR VPB phighvt w=870000u l=4.73e+06u
-+  ad=4.524e+11p pd=4.52e+06u as=0p ps=0u
-M1001 VGND VPWR VGND VNB nshort w=550000u l=4.73e+06u
-+  ad=2.86e+11p pd=3.24e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o211a_2 C1 B1 A2 A1 X VNB VPB VPWR VGND
-M1000 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.12e+12p pd=8.24e+06u as=3e+11p ps=2.6e+06u
-M1001 a_120_47# C1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=1.82e+11p pd=1.86e+06u as=2.0475e+11p ps=1.93e+06u
-M1002 VPWR C1 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.055e+12p ps=6.11e+06u
-M1003 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_206_47# B1 a_120_47# VNB nshort w=650000u l=150000u
-+  ad=3.7375e+11p pd=3.75e+06u as=0p ps=0u
-M1005 a_206_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.4425e+11p ps=6.19e+06u
-M1006 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=2.34e+11p pd=2.02e+06u as=0p ps=0u
-M1007 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_47# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A1 a_206_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_406_297# A2 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=2.3e+11p pd=2.46e+06u as=0p ps=0u
-M1011 VPWR A1 a_406_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor2_4 Y A B VPB VNB VGND VPWR
-M1000 Y B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.44e+12p ps=1.288e+07u
-M1001 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1002 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=9.425e+11p pd=9.4e+06u as=8.97e+11p ps=7.96e+06u
-M1003 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__inputiso1p_1 SLEEP X A VPB VNB VGND VPWR
-M1000 a_44_297# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=3.517e+11p ps=3.53e+06u
-M1001 VPWR SLEEP a_134_297# VPB phighvt w=420000u l=180000u
-+  ad=3.057e+11p pd=2.71e+06u as=1.218e+11p ps=1.42e+06u
-M1002 X a_44_297# VGND VNB nshort w=650000u l=150000u
-+  ad=2.405e+11p pd=2.04e+06u as=0p ps=0u
-M1003 VGND SLEEP a_44_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_134_297# A a_44_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1005 X a_44_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=4.1e+11p pd=2.82e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__dfstp_1 D VPWR CLK VGND Q VPB VNB SET_B
-M1000 VPWR SET_B a_1126_413# VPB phighvt w=420000u l=180000u
-+  ad=1.3883e+12p pd=1.359e+07u as=2.856e+11p ps=3.04e+06u
-M1001 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.18655e+12p ps=1.1e+07u
-M1002 a_506_47# a_27_47# a_409_329# VNB nshort w=360000u l=150000u
-+  ad=1.8e+11p pd=1.72e+06u as=1.87e+11p ps=1.93e+06u
-M1003 Q a_1738_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.2e+11p pd=2.64e+06u as=0p ps=0u
-M1004 a_1344_47# a_27_47# a_1126_413# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.596e+11p ps=1.6e+06u
-M1005 VGND a_1126_413# a_1738_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1006 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1007 VPWR a_1126_413# a_1738_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1008 VPWR a_702_21# a_610_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.974e+11p ps=1.78e+06u
-M1009 Q a_1738_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.9825e+11p pd=1.91e+06u as=0p ps=0u
-M1010 VPWR a_1288_261# a_1244_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=9.66e+10p ps=1.3e+06u
-M1011 a_1126_413# a_211_363# a_1156_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1012 a_1044_413# a_506_47# VPWR VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=0p ps=0u
-M1013 a_409_329# D VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_409_329# D VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.625e+11p pd=2.39e+06u as=0p ps=0u
-M1015 a_1156_47# a_506_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_636_47# a_211_363# a_506_47# VNB nshort w=360000u l=150000u
-+  ad=1.341e+11p pd=1.5e+06u as=0p ps=0u
-M1017 VPWR a_506_47# a_702_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1018 a_1288_261# a_1126_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1019 a_610_413# a_27_47# a_506_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1020 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1021 a_866_47# SET_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1022 VGND a_702_21# a_636_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1288_261# a_1126_413# VGND VNB nshort w=540000u l=150000u
-+  ad=1.404e+11p pd=1.6e+06u as=0p ps=0u
-M1024 a_1244_413# a_211_363# a_1126_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_702_21# a_506_47# a_866_47# VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1026 a_702_21# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1028 a_506_47# a_211_363# a_409_329# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1416_47# a_1288_261# a_1344_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1030 a_1126_413# a_27_47# a_1044_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND SET_B a_1416_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand4b_4 C D B Y A_N VNB VPB VGND VPWR
-M1000 a_225_47# B a_693_47# VNB nshort w=650000u l=150000u
-+  ad=9.945e+11p pd=9.56e+06u as=8.32e+11p ps=7.76e+06u
-M1001 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.32e+12p pd=2.064e+07u as=3.36e+12p ps=2.672e+07u
-M1002 VGND D a_1081_47# VNB nshort w=650000u l=150000u
-+  ad=5.85e+11p pd=5.7e+06u as=9.945e+11p ps=9.56e+06u
-M1003 a_693_47# B a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_225_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1010 Y a_27_47# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A_N a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1012 a_1081_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_225_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1081_47# C a_693_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_693_47# C a_1081_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_225_47# B a_693_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1024 VGND D a_1081_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y a_27_47# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_693_47# B a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1081_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1081_47# C a_693_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_693_47# C a_1081_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand2_12 Y A B VPB VNB VGND VPWR
-M1000 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=3.73e+12p pd=3.346e+07u as=3.48e+12p ps=3.096e+07u
-M1001 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=2.3335e+12p pd=2.408e+07u as=1.443e+12p ps=1.224e+07u
-M1004 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=1.378e+12p pd=1.204e+07u as=0p ps=0u
-M1008 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__buf_12 A X VGND VPWR VPB VNB
-M1000 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=2.61e+12p pd=2.322e+07u as=1.74e+12p ps=1.548e+07u
-M1001 VPWR A a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1002 VGND A a_117_297# VNB nshort w=650000u l=150000u
-+  ad=1.82e+12p pd=1.73e+07u as=4.16e+11p ps=3.88e+06u
-M1003 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.2805e+12p ps=1.174e+07u
-M1007 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_117_297# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A a_117_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_117_297# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a21o_8 A2 A1 X B1 VNB VPB VGND VPWR
-M1000 VGND A2 a_297_47# VNB nshort w=650000u l=150000u
-+  ad=1.9305e+12p pd=1.504e+07u as=1.69e+11p ps=1.82e+06u
-M1001 X a_213_47# VGND VNB nshort w=650000u l=150000u
-+  ad=7.02e+11p pd=7.36e+06u as=0p ps=0u
-M1002 VGND a_213_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.12e+12p pd=1.024e+07u as=1.99e+12p ps=1.798e+07u
-M1004 a_213_47# A1 a_131_47# VNB nshort w=650000u l=150000u
-+  ad=3.51e+11p pd=3.68e+06u as=1.69e+11p ps=1.82e+06u
-M1005 X a_213_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=0p ps=0u
-M1006 X a_213_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_213_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_297_47# A1 a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# B1 a_213_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1010 VGND a_213_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_213_47# B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_213_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_131_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_213_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_213_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_213_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_213_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_213_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_213_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_213_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND B1 a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_213_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_213_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 X a_213_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sdfrtn_1 VPB VNB RESET_B VPWR VGND SCE SCD D CLK_N Q
-M1000 a_1428_47# a_1380_303# a_1322_47# VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.518e+11p ps=1.6e+06u
-M1001 a_213_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=1.3533e+12p ps=1.268e+07u
-M1002 VPWR a_1972_21# a_1951_413# VPB phighvt w=420000u l=180000u
-+  ad=1.6398e+12p pd=1.569e+07u as=1.386e+11p ps=1.5e+06u
-M1003 a_1972_21# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1004 Q a_1972_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.15e+11p pd=2.63e+06u as=0p ps=0u
-M1005 a_2157_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=0p ps=0u
-M1006 VPWR SCD a_870_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=1.971e+11p ps=1.81e+06u
-M1007 a_700_389# D a_631_119# VNB nshort w=420000u l=150000u
-+  ad=3.3215e+11p pd=3.47e+06u as=1.302e+11p ps=1.46e+06u
-M1008 a_1380_303# a_1202_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.541e+11p pd=2.37e+06u as=0p ps=0u
-M1009 a_1202_413# a_213_47# a_700_389# VNB nshort w=360000u l=150000u
-+  ad=1.44e+11p pd=1.52e+06u as=0p ps=0u
-M1010 VPWR a_1757_47# a_1972_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1972_21# a_1757_47# a_2157_47# VNB nshort w=420000u l=150000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1012 Q a_1972_21# VGND VNB nshort w=650000u l=150000u
-+  ad=1.9825e+11p pd=1.91e+06u as=0p ps=0u
-M1013 VPWR a_1380_303# a_1324_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1014 VPWR CLK_N a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1015 a_618_389# SCE VPWR VPB phighvt w=540000u l=180000u
-+  ad=1.242e+11p pd=1.54e+06u as=0p ps=0u
-M1016 a_1951_413# a_27_47# a_1757_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1017 a_700_389# D a_618_389# VPB phighvt w=540000u l=180000u
-+  ad=5.193e+11p pd=4.01e+06u as=0p ps=0u
-M1018 a_631_119# a_331_66# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND RESET_B a_1428_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1324_413# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1202_413# a_27_47# a_700_389# VPB phighvt w=420000u l=180000u
-+  ad=1.806e+11p pd=1.7e+06u as=0p ps=0u
-M1022 a_1324_413# a_213_47# a_1202_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1866_47# a_213_47# a_1757_47# VNB nshort w=360000u l=150000u
-+  ad=2.121e+11p pd=1.9e+06u as=1.422e+11p ps=1.51e+06u
-M1024 a_1757_47# a_27_47# a_1380_303# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.87e+11p ps=1.93e+06u
-M1025 VPWR SCE a_331_66# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=2.214e+11p ps=1.9e+06u
-M1026 VGND CLK_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1027 VGND a_1972_21# a_1866_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_213_47# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1029 a_899_66# SCE a_700_389# VNB nshort w=420000u l=500000u
-+  ad=1.554e+11p pd=1.58e+06u as=0p ps=0u
-M1030 a_1757_47# a_213_47# a_1380_303# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1322_47# a_27_47# a_1202_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND SCD a_899_66# VNB nshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_870_389# a_331_66# a_700_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND SCE a_331_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1035 a_1380_303# a_1202_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o2bb2ai_4 A1_N B1 B2 A2_N Y VPB VNB VGND VPWR
-M1000 VGND B2 a_887_47# VNB nshort w=650000u l=150000u
-+  ad=1.3455e+12p pd=1.194e+07u as=1.6315e+12p ps=1.412e+07u
-M1001 a_113_47# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=3.08e+12p ps=2.416e+07u
-M1002 a_113_47# A2_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_47# A2_N a_113_47# VNB nshort w=650000u l=150000u
-+  ad=9.425e+11p pd=9.4e+06u as=4.485e+11p ps=3.98e+06u
-M1004 VPWR a_113_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1005 VPWR B1 a_1361_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.43e+12p ps=1.286e+07u
-M1006 Y a_113_47# a_887_47# VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1007 Y a_113_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_887_47# a_113_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B1 a_887_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A2_N a_113_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B2 a_1361_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_887_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_887_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1361_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A1_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND B2 a_887_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_47# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_113_47# A2_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_113_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR B1 a_1361_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_113_47# A2_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_47# A2_N a_113_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A1_N a_113_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1361_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1361_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND B1 a_887_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_887_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_887_47# a_113_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A2_N a_113_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y B2 a_1361_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A1_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1361_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y a_113_47# a_887_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_887_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_113_47# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y a_113_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_113_47# A2_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_27_47# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR A1_N a_113_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor4_1 D C Y A B VPB VNB VGND VPWR
-M1000 a_221_297# C a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=3.4e+11p ps=2.68e+06u
-M1001 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=6.045e+11p pd=5.76e+06u as=4.29e+11p ps=3.92e+06u
-M1002 VPWR A a_317_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=3.1e+11p ps=2.62e+06u
-M1003 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_117_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1005 a_317_297# B a_221_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__clkinvlp_2 VNB VPWR VGND VPB Y A
-M1000 Y A a_150_67# VNB nshort w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=1.98e+11p ps=1.82e+06u
-M1001 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=6.5e+11p pd=5.3e+06u as=2.8e+11p ps=2.56e+06u
-M1002 a_150_67# A VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1003 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__einvp_8 A Z TE VPWR VGND VPB VNB
-M1000 Z A a_235_309# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=2.5515e+12p ps=2.277e+07u
-M1001 a_213_47# TE VGND VNB nshort w=650000u l=150000u
-+  ad=1.885e+12p pd=1.75e+07u as=1.014e+12p ps=9.62e+06u
-M1002 a_213_47# TE VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_27_47# a_235_309# VPB phighvt w=940000u l=180000u
-+  ad=1.3604e+12p pd=1.238e+07u as=0p ps=0u
-M1004 Z A a_235_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_235_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_27_47# a_235_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Z A a_213_47# VNB nshort w=650000u l=150000u
-+  ad=8.32e+11p pd=7.76e+06u as=0p ps=0u
-M1008 a_213_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_235_309# a_27_47# VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND TE a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Z A a_235_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_213_47# TE VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR TE a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1014 VPWR a_27_47# a_235_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_235_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND TE a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Z A a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_235_309# a_27_47# VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_213_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Z A a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Z A a_235_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND TE a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_213_47# TE VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_235_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND TE a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_213_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_27_47# a_235_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Z A a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_235_309# a_27_47# VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_235_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND TE a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1032 a_213_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_235_309# a_27_47# VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and2_4 X B A VNB VPB VGND VPWR
-M1000 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6e+11p pd=5.2e+06u as=1.245e+12p ps=1.049e+07u
-M1001 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=7.085e+11p pd=6.08e+06u as=4.615e+11p ps=4.02e+06u
-M1002 a_120_47# A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=1.365e+11p pd=1.72e+06u as=2.0475e+11p ps=1.93e+06u
-M1003 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_47# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1005 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B a_120_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__dfrtp_1 RESET_B VGND VPWR Q D CLK VPB VNB
-M1000 a_436_413# D VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.428e+11p pd=1.52e+06u as=1.3145e+12p ps=1.289e+07u
-M1001 VPWR a_1323_21# a_1330_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=9.66e+10p ps=1.3e+06u
-M1002 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.1789e+12p ps=1.006e+07u
-M1003 Q a_1323_21# VGND VNB nshort w=650000u l=150000u
-+  ad=1.82e+11p pd=1.86e+06u as=0p ps=0u
-M1004 a_649_413# a_27_47# a_534_47# VPB phighvt w=420000u l=180000u
-+  ad=3.318e+11p pd=3.26e+06u as=1.533e+11p ps=1.57e+06u
-M1005 a_805_47# a_751_289# a_642_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.748e+11p ps=2.17e+06u
-M1006 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1007 VGND RESET_B a_805_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_436_413# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.338e+11p pd=1.5e+06u as=0p ps=0u
-M1009 VGND a_1323_21# a_1237_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.698e+11p ps=1.7e+06u
-M1010 VPWR a_751_289# a_649_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_751_289# a_534_47# VGND VNB nshort w=640000u l=150000u
-+  ad=1.998e+11p pd=1.97e+06u as=0p ps=0u
-M1012 Q a_1323_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1013 VPWR a_1128_47# a_1323_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1014 a_1128_47# a_211_363# a_751_289# VNB nshort w=360000u l=150000u
-+  ad=1.422e+11p pd=1.51e+06u as=0p ps=0u
-M1015 a_534_47# a_27_47# a_436_413# VNB nshort w=360000u l=150000u
-+  ad=1.404e+11p pd=1.5e+06u as=0p ps=0u
-M1016 a_751_289# a_534_47# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.709e+11p pd=2.41e+06u as=0p ps=0u
-M1017 a_1128_47# a_27_47# a_751_289# VPB phighvt w=420000u l=180000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1018 a_642_47# a_211_363# a_534_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1237_47# a_27_47# a_1128_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1542_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1021 a_1323_21# a_1128_47# a_1542_47# VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1022 a_649_413# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1024 a_1323_21# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1026 a_534_47# a_211_363# a_436_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1330_413# a_211_363# a_1128_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sdlclkp_1 CLK VGND VPWR SCE GCLK GATE VPB VNB
-M1000 a_484_315# a_299_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=1.3826e+12p ps=1.216e+07u
-M1001 a_1089_47# a_484_315# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.92e+11p pd=1.88e+06u as=0p ps=0u
-M1002 a_269_21# CLK VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1003 a_27_47# GATE a_117_369# VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=1.472e+11p ps=1.74e+06u
-M1004 a_484_315# a_299_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=7.9265e+11p ps=7.37e+06u
-M1005 a_117_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_415_47# a_266_243# a_299_47# VNB nshort w=360000u l=150000u
-+  ad=1.968e+11p pd=1.85e+06u as=1.548e+11p ps=1.58e+06u
-M1007 a_269_21# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1008 a_1181_47# a_484_315# a_1089_47# VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=1.302e+11p ps=1.46e+06u
-M1009 a_410_413# a_269_21# a_299_47# VPB phighvt w=420000u l=180000u
-+  ad=1.596e+11p pd=1.6e+06u as=1.47e+11p ps=1.54e+06u
-M1010 VPWR a_484_315# a_410_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_484_315# a_415_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 GCLK a_1089_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1013 VGND CLK a_1181_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_299_47# a_269_21# a_27_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=2.622e+11p ps=2.95e+06u
-M1015 VGND SCE a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR CLK a_1089_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_299_47# a_266_243# a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 GCLK a_1089_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.8525e+11p pd=1.87e+06u as=0p ps=0u
-M1019 VGND a_269_21# a_266_243# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1020 VPWR a_269_21# a_266_243# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1021 a_27_47# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a32oi_4 A3 A2 A1 B1 Y B2 VNB VPB VGND VPWR
-M1000 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=3.925e+12p pd=2.985e+07u as=1.16e+12p ps=1.032e+07u
-M1001 a_27_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=9.62e+11p pd=9.46e+06u as=9.75e+11p ps=9.5e+06u
-M1003 a_893_47# A2 a_1379_47# VNB nshort w=650000u l=150000u
-+  ad=1.053e+12p pd=9.74e+06u as=8.97e+11p ps=7.96e+06u
-M1004 Y B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.195e+12p ps=1.639e+07u
-M1006 VPWR A3 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_893_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=8.645e+11p ps=7.86e+06u
-M1008 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A1 a_893_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1379_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1379_47# A2 a_893_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_893_47# A2 a_1379_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A3 a_1379_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_27_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR A3 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_893_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_27_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Y A1 a_893_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1379_47# A2 a_893_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1379_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND A3 a_1379_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and4_1 X C A B D VGND VPWR VPB VNB
-M1000 VGND D a_299_47# VNB nshort w=420000u l=150000u
-+  ad=2.7525e+11p pd=2.2e+06u as=1.428e+11p ps=1.52e+06u
-M1001 a_27_47# A VPWR VPB phighvt w=420000u l=180000u
-+  ad=2.52e+11p pd=2.88e+06u as=5.601e+11p ps=5.56e+06u
-M1002 a_203_47# B a_119_47# VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=1.134e+11p ps=1.38e+06u
-M1003 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=4.6e+11p pd=2.92e+06u as=0p ps=0u
-M1004 a_27_47# C VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=2.925e+11p pd=2.2e+06u as=0p ps=0u
-M1006 a_299_47# C a_203_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_119_47# A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1008 VPWR B a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR D a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand2_4 Y A B VPB VNB VGND VPWR
-M1000 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.41e+12p pd=1.282e+07u as=1.16e+12p ps=1.032e+07u
-M1001 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=9.62e+11p pd=9.46e+06u as=4.16e+11p ps=3.88e+06u
-M1003 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.485e+11p ps=3.98e+06u
-M1006 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a21bo_4 B1_N A2 A1 X VNB VPB VGND VPWR
-M1000 X a_209_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6e+11p pd=5.2e+06u as=1.47e+12p ps=1.294e+07u
-M1001 X a_209_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.29e+11p pd=3.92e+06u as=1.4235e+12p ps=1.088e+07u
-M1002 VPWR A2 a_647_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.12e+12p ps=1.024e+07u
-M1003 VPWR B1_N a_36_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.55e+06u
-M1004 VGND a_209_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_647_297# a_36_47# a_209_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1006 VPWR a_209_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_209_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_647_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_209_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_36_47# a_209_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.485e+11p ps=3.98e+06u
-M1011 a_1115_47# A1 a_209_21# VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=0p ps=0u
-M1012 VPWR a_209_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND B1_N a_36_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.8275e+11p ps=2.17e+06u
-M1014 VPWR A1 a_647_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A2 a_1115_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_209_21# a_36_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_935_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.495e+11p pd=1.76e+06u as=0p ps=0u
-M1018 X a_209_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_209_21# a_36_47# a_647_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_647_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_209_21# A1 a_935_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o21a_2 A1 B1 A2 X VNB VPB VGND VPWR
-M1000 a_79_21# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=1.365e+12p ps=8.73e+06u
-M1001 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1002 a_414_47# B1 a_79_21# VNB nshort w=650000u l=150000u
-+  ad=3.8675e+11p pd=3.79e+06u as=2.0475e+11p ps=1.93e+06u
-M1003 a_414_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.1825e+11p ps=6.11e+06u
-M1004 VGND A2 a_414_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.1125e+11p pd=1.95e+06u as=0p ps=0u
-M1006 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_508_297# A2 a_79_21# VPB phighvt w=1e+06u l=180000u
-+  ad=5e+11p pd=3e+06u as=0p ps=0u
-M1008 VPWR A1 a_508_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a31oi_4 Y B1 A2 A3 A1 VNB VPB VPWR VGND
-M1000 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.2e+12p pd=2.44e+07u as=1.74e+12p ps=1.548e+07u
-M1001 a_27_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=9.62e+11p pd=9.46e+06u as=8.32e+11p ps=7.76e+06u
-M1003 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1006 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=1.0335e+12p pd=9.68e+06u as=0p ps=0u
-M1007 Y A1 a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=8.645e+11p ps=7.86e+06u
-M1008 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_47# A2 a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A3 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_485_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_485_47# A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A3 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_47# A2 a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y A1 a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_485_47# A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_485_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A3 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A3 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__mux2i_4 S A1 A0 Y VNB VPB VGND VPWR
-M1000 Y A1 a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.41e+12p pd=1.282e+07u as=1.215e+12p ps=1.043e+07u
-M1001 VGND a_1311_21# a_109_47# VNB nshort w=650000u l=150000u
-+  ad=1.03025e+12p pd=9.67e+06u as=9.3275e+11p ps=8.07e+06u
-M1002 Y A0 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1003 VPWR a_1311_21# a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.475e+12p pd=1.295e+07u as=0p ps=0u
-M1004 a_109_47# a_1311_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_117_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND S a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=8.645e+11p ps=7.86e+06u
-M1007 a_493_297# A1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_485_47# S VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR S a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_109_47# A0 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=9.295e+11p ps=9.36e+06u
-M1011 Y A1 a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A0 a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A1 a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_493_297# a_1311_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_117_297# A0 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND S a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_493_297# A1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_1311_21# a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_485_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_117_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_109_47# a_1311_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A0 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_493_297# a_1311_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_485_47# S VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A0 a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A1 a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_485_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND a_1311_21# a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1311_21# S VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1030 a_117_297# A0 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR S a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_109_47# A0 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1311_21# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand4_1 C B Y D A VPB VNB VPWR VGND
-M1000 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=6.4e+11p ps=5.28e+06u
-M1001 a_213_47# C a_119_47# VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=2.08e+11p ps=1.94e+06u
-M1002 Y A a_297_47# VNB nshort w=650000u l=150000u
-+  ad=2.275e+11p pd=2e+06u as=2.47e+11p ps=2.06e+06u
-M1003 a_297_47# B a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_119_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1007 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and3b_1 A_N B X C VGND VPWR VPB VNB
-M1000 a_317_53# a_117_413# a_225_311# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=1.197e+11p ps=1.41e+06u
-M1001 X a_225_311# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=4.7045e+11p ps=4.01e+06u
-M1002 a_117_413# A_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=5.913e+11p ps=5.75e+06u
-M1003 a_225_311# B VPWR VPB phighvt w=420000u l=180000u
-+  ad=2.7055e+11p pd=3.05e+06u as=0p ps=0u
-M1004 VPWR C a_225_311# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_117_413# a_225_311# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_117_413# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1007 a_411_53# B a_317_53# VNB nshort w=420000u l=150000u
-+  ad=1.071e+11p pd=1.35e+06u as=0p ps=0u
-M1008 X a_225_311# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1009 VGND C a_411_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__ebufn_8 A Z TE_B VNB VPB VGND VPWR
-M1000 VPWR TE_B a_437_309# VPB phighvt w=940000u l=180000u
-+  ad=1.9584e+12p pd=1.56e+07u as=3.2075e+12p ps=2.41e+07u
-M1001 VPWR TE_B a_437_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_437_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_437_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_485_47# a_124_297# Z VNB nshort w=650000u l=150000u
-+  ad=2.106e+12p pd=1.818e+07u as=8.645e+11p ps=7.86e+06u
-M1005 VPWR A a_124_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1006 a_437_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_321_47# TE_B VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=1.417e+12p ps=1.216e+07u
-M1008 a_437_309# a_124_297# Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1009 a_485_47# a_321_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_485_47# a_321_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_485_47# a_124_297# Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR TE_B a_437_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_124_297# A VGND VNB nshort w=650000u l=150000u
-+  ad=2.08e+11p pd=1.94e+06u as=0p ps=0u
-M1014 a_321_47# TE_B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1015 Z a_124_297# a_437_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR TE_B a_437_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Z a_124_297# a_437_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_321_47# a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_485_47# a_321_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_437_309# a_124_297# Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_437_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_321_47# a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Z a_124_297# a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Z a_124_297# a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_485_47# a_124_297# Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A a_124_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_485_47# a_124_297# Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_437_309# a_124_297# Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Z a_124_297# a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_437_309# a_124_297# Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Z a_124_297# a_437_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND a_321_47# a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_124_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND a_321_47# a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 Z a_124_297# a_437_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_485_47# a_321_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Z a_124_297# a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor2_2 B Y A VPB VNB VGND VPWR
-M1000 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=8.5e+11p ps=7.7e+06u
-M1001 a_27_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1002 Y B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=4.81e+11p pd=4.08e+06u as=6.0125e+11p ps=5.75e+06u
-M1004 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__dlrtn_4 RESET_B D GATE_N Q VGND VPWR VPB VNB
-M1000 Q a_750_21# VGND VNB nshort w=650000u l=150000u
-+  ad=3.51e+11p pd=3.68e+06u as=1.00625e+12p ps=1.01e+07u
-M1001 VGND a_750_21# a_708_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1002 Q a_750_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.691e+12p ps=1.487e+07u
-M1003 VPWR GATE_N a_27_363# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1004 VPWR a_750_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_203_47# a_27_363# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1006 VPWR a_750_21# a_702_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1007 VGND a_750_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_503_369# a_319_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=0p ps=0u
-M1009 a_708_47# a_203_47# a_604_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1010 Q a_750_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Q a_750_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND D a_319_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1013 VPWR D a_319_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1014 VGND RESET_B a_981_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.6575e+11p ps=1.81e+06u
-M1015 a_604_47# a_27_363# a_500_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1016 VPWR RESET_B a_750_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1017 a_981_47# a_604_47# a_750_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1018 VGND GATE_N a_27_363# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1019 a_702_413# a_27_363# a_604_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1020 a_203_47# a_27_363# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1021 a_604_47# a_203_47# a_503_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_750_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_500_47# a_319_369# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_750_21# a_604_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_750_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand4b_2 D C B Y A_N VNB VPB VGND VPWR
-M1000 VPWR A_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=2.2234e+12p pd=1.56e+07u as=1.134e+11p ps=1.38e+06u
-M1001 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1002 a_705_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=6.37e+11p pd=5.86e+06u as=3.172e+11p ps=3.3e+06u
-M1003 VPWR D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_225_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=5.785e+11p pd=5.68e+06u as=2.08e+11p ps=1.94e+06u
-M1005 a_705_47# C a_495_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1006 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND D a_705_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_225_47# B a_495_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_495_47# B a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1012 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y a_27_47# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_495_47# C a_705_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or2b_4 A B_N X VNB VPB VGND VPWR
-M1000 VGND B_N a_27_53# VNB nshort w=420000u l=150000u
-+  ad=1.11205e+12p pd=8.88e+06u as=1.302e+11p ps=1.46e+06u
-M1001 a_27_53# B_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=1.0684e+12p ps=9.29e+06u
-M1002 VPWR a_229_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1003 VGND A a_229_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1004 a_229_297# a_27_53# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_319_297# a_27_53# a_229_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.3e+11p pd=2.46e+06u as=2.7e+11p ps=2.54e+06u
-M1006 X a_229_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_319_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_229_297# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1009 VGND a_229_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_229_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_229_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_229_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_229_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__xnor2_1 VGND VPWR B Y A VPB VNB
-M1000 Y B a_415_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.5e+11p pd=2.7e+06u as=2.3e+11p ps=2.46e+06u
-M1001 a_415_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.48e+12p ps=8.96e+06u
-M1002 a_139_47# B a_47_47# VNB nshort w=650000u l=150000u
-+  ad=1.365e+11p pd=1.72e+06u as=2.015e+11p ps=1.92e+06u
-M1003 VPWR A a_47_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1004 a_315_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=4.42e+11p ps=3.96e+06u
-M1005 Y a_47_47# a_315_47# VNB nshort w=650000u l=150000u
-+  ad=1.95e+11p pd=1.9e+06u as=0p ps=0u
-M1006 a_315_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A a_139_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_47_47# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_47_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a21o_6 A2 A1 X B1 VNB VPB VGND VPWR
-M1000 VGND A2 a_297_47# VNB nshort w=650000u l=150000u
-+  ad=1.69e+12p pd=1.3e+07u as=1.69e+11p ps=1.82e+06u
-M1001 X a_213_47# VGND VNB nshort w=650000u l=150000u
-+  ad=5.265e+11p pd=5.52e+06u as=0p ps=0u
-M1002 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.12e+12p pd=1.024e+07u as=1.7e+12p ps=1.54e+07u
-M1003 a_213_47# A1 a_131_47# VNB nshort w=650000u l=150000u
-+  ad=3.51e+11p pd=3.68e+06u as=1.69e+11p ps=1.82e+06u
-M1004 X a_213_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=0p ps=0u
-M1005 X a_213_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_213_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_297_47# A1 a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_297# B1 a_213_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1009 VGND a_213_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_213_47# B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_131_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_213_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_213_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_213_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_213_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_213_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND B1 a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_213_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_213_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_213_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a2bb2oi_4 Y A2_N B2 A1_N B1 VNB VPB VGND VPWR
-M1000 a_27_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.99e+12p pd=1.798e+07u as=1.74e+12p ps=1.548e+07u
-M1001 VGND A1_N a_831_21# VNB nshort w=650000u l=150000u
-+  ad=2.067e+12p pd=1.806e+07u as=8.97e+11p ps=7.96e+06u
-M1002 a_27_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_831_21# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_297# a_831_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1005 VPWR B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_831_21# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=8.97e+11p ps=7.96e+06u
-M1007 a_831_21# A2_N a_1259_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.43e+12p ps=1.286e+07u
-M1008 Y a_831_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_831_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_297# B2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B1 a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.995e+11p ps=7.66e+06u
-M1012 VGND B1 a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A1_N a_1259_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_109_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_831_21# A2_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1259_297# A2_N a_831_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_831_21# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A1_N a_831_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1259_297# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_831_21# A2_N a_1259_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_297# a_831_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_831_21# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A2_N a_831_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_297# B2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A1_N a_1259_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1259_297# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y a_831_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y B2 a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_109_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_109_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Y B2 a_109_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 Y a_831_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1259_297# A2_N a_831_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_831_21# A2_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_109_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND A2_N a_831_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__bufinv_16 A Y VNB VPB VGND VPWR
-M1000 a_391_47# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=3.75e+12p ps=3.35e+07u
-M1001 a_27_47# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1002 Y a_391_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.32e+12p pd=2.064e+07u as=0p ps=0u
-M1003 Y a_391_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_391_47# Y VNB nshort w=650000u l=150000u
-+  ad=2.6e+12p pd=2.49e+07u as=1.6965e+12p ps=1.562e+07u
-M1005 VPWR a_27_47# a_391_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_391_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_391_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y a_391_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_391_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y a_391_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_391_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_391_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_391_47# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=4.095e+11p pd=3.86e+06u as=0p ps=0u
-M1015 VPWR a_391_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y a_391_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_391_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y a_391_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y a_391_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_391_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=6.565e+11p pd=5.92e+06u as=0p ps=0u
-M1022 Y a_391_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_27_47# a_391_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_27_47# a_391_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_391_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_391_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y a_391_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y a_391_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y a_391_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_391_47# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_391_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y a_391_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_391_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Y a_391_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR a_27_47# a_391_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_391_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Y a_391_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Y a_391_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_391_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND a_27_47# a_391_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_391_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VGND a_391_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VGND a_391_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VPWR a_391_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VPWR a_391_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 VGND a_27_47# a_391_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or4b_1 B D_N A X C VPWR VGND VPB VNB
-M1000 a_117_297# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=6.1845e+11p ps=6.42e+06u
-M1001 a_225_297# a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=2.961e+11p pd=3.09e+06u as=0p ps=0u
-M1002 X a_225_297# VGND VNB nshort w=650000u l=150000u
-+  ad=1.7875e+11p pd=1.85e+06u as=0p ps=0u
-M1003 VGND A a_225_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_117_297# D_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=4.241e+11p ps=4.1e+06u
-M1005 a_504_297# B a_416_297# VPB phighvt w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=1.092e+11p ps=1.36e+06u
-M1006 a_225_297# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_504_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND C a_225_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_315_297# a_117_297# a_225_297# VPB phighvt w=420000u l=180000u
-+  ad=1.365e+11p pd=1.49e+06u as=1.134e+11p ps=1.38e+06u
-M1010 a_416_297# C a_315_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_225_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o2bb2ai_2 B2 Y A1_N A2_N B1 VNB VPB VGND VPWR
-M1000 a_121_297# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.9e+11p pd=5.18e+06u as=1.96e+12p ps=1.392e+07u
-M1001 a_121_297# A2_N a_123_47# VNB nshort w=650000u l=150000u
-+  ad=2.405e+11p pd=2.04e+06u as=3.575e+11p ps=3.7e+06u
-M1002 a_503_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=8.7425e+11p pd=7.89e+06u as=7.345e+11p ps=7.46e+06u
-M1003 VPWR A1_N a_121_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A1_N a_123_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_788_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=5.8e+11p ps=5.16e+06u
-M1006 a_123_47# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_121_297# A2_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B2 a_788_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_121_297# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_503_47# a_121_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1011 a_123_47# A2_N a_121_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y a_121_297# a_503_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_503_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_788_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A2_N a_121_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y a_121_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND B2 a_503_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND B1 a_503_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR B1 a_788_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a2bb2o_1 VNB VPB VGND VPWR B1 A1_N A2_N X B2
-M1000 a_525_413# a_243_47# a_79_21# VPB phighvt w=420000u l=180000u
-+  ad=2.352e+11p pd=2.8e+06u as=1.134e+11p ps=1.38e+06u
-M1001 a_611_47# B2 a_79_21# VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=1.134e+11p ps=1.38e+06u
-M1002 a_79_21# a_243_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=7.746e+11p ps=6.34e+06u
-M1003 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=4.674e+11p pd=4.32e+06u as=2.7e+11p ps=2.54e+06u
-M1004 a_241_297# A1_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.029e+11p pd=1.33e+06u as=0p ps=0u
-M1005 a_525_413# B1 VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2_N a_243_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1007 VGND B1 a_611_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_243_47# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_243_47# A2_N a_241_297# VPB phighvt w=420000u l=180000u
-+  ad=1.155e+11p pd=1.39e+06u as=0p ps=0u
-M1010 VPWR B2 a_525_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-.ends
-.subckt sky130_fd_sc_hdll__xor3_1 X C B A VNB VPB VGND VPWR
-M1000 VGND A a_991_365# VNB nshort w=640000u l=150000u
-+  ad=9.7095e+11p pd=6.94e+06u as=4.498e+11p ps=3.99e+06u
-M1001 a_276_93# C VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.856e+11p pd=1.86e+06u as=1.3094e+12p ps=8.68e+06u
-M1002 a_276_93# C VGND VNB nshort w=420000u l=150000u
-+  ad=1.974e+11p pd=1.78e+06u as=0p ps=0u
-M1003 a_875_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=1.653e+11p pd=1.82e+06u as=0p ps=0u
-M1004 a_424_49# B a_991_365# VNB nshort w=640000u l=150000u
-+  ad=5.931e+11p pd=4.52e+06u as=0p ps=0u
-M1005 a_116_21# C a_406_325# VPB phighvt w=840000u l=180000u
-+  ad=3.36e+11p pd=2.48e+06u as=7.824e+11p ps=5.28e+06u
-M1006 a_875_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.126e+11p pd=2.64e+06u as=0p ps=0u
-M1007 a_116_21# C a_424_49# VNB nshort w=640000u l=150000u
-+  ad=2.88e+11p pd=2.18e+06u as=0p ps=0u
-M1008 a_1276_297# a_875_297# a_424_49# VNB nshort w=420000u l=150000u
-+  ad=5.677e+11p pd=4.42e+06u as=0p ps=0u
-M1009 a_406_325# B a_1276_297# VNB nshort w=640000u l=150000u
-+  ad=6.5745e+11p pd=4.66e+06u as=0p ps=0u
-M1010 a_991_365# a_875_297# a_424_49# VPB phighvt w=840000u l=180000u
-+  ad=7.234e+11p pd=5.3e+06u as=7.558e+11p ps=5.2e+06u
-M1011 a_406_325# B a_991_365# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_424_49# B a_1276_297# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=7.998e+11p ps=5.68e+06u
-M1013 a_1276_297# a_991_365# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_991_365# a_875_297# a_406_325# VNB nshort w=600000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1276_297# a_875_297# a_406_325# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A a_991_365# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_424_49# a_276_93# a_116_21# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_116_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.82e+11p ps=1.86e+06u
-M1019 VPWR a_116_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1020 a_406_325# a_276_93# a_116_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1276_297# a_991_365# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__dlrtp_1 RESET_B D GATE Q VGND VPWR VPB VNB
-M1000 VGND a_750_21# a_708_47# VNB nshort w=420000u l=150000u
-+  ad=5.6425e+11p pd=6.14e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR GATE a_27_363# VPB phighvt w=640000u l=180000u
-+  ad=1.131e+12p pd=9.75e+06u as=1.728e+11p ps=1.82e+06u
-M1002 a_203_47# a_27_363# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1003 VPWR a_750_21# a_702_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1004 a_503_369# a_319_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=0p ps=0u
-M1005 a_708_47# a_27_363# a_604_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1006 Q a_750_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1007 VGND D a_319_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1008 VPWR D a_319_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1009 VGND RESET_B a_981_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.6575e+11p ps=1.81e+06u
-M1010 a_604_47# a_203_47# a_500_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1011 Q a_750_21# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1012 VPWR RESET_B a_750_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1013 a_981_47# a_604_47# a_750_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1014 VGND GATE a_27_363# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1015 a_702_413# a_203_47# a_604_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1016 a_203_47# a_27_363# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1017 a_604_47# a_27_363# a_503_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_500_47# a_319_369# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_750_21# a_604_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor2b_4 B_N Y A VNB VPB VGND VPWR
-M1000 Y a_459_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.45e+12p ps=1.29e+07u
-M1001 VGND a_459_21# Y VNB nshort w=650000u l=150000u
-+  ad=1.183e+12p pd=1.144e+07u as=8.645e+11p ps=7.86e+06u
-M1002 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=0p ps=0u
-M1003 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y a_459_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_459_21# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_297# a_459_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B_N a_459_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1012 VGND B_N a_459_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.82e+11p ps=1.86e+06u
-M1013 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y a_459_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y a_459_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_297# a_459_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__buf_1 VGND VPWR X A VPB VNB
-M1000 VPWR A a_27_47# VPB phighvt w=790000u l=180000u
-+  ad=2.449e+11p pd=2.2e+06u as=2.133e+11p ps=2.12e+06u
-M1001 X a_27_47# VPWR VPB phighvt w=790000u l=180000u
-+  ad=2.133e+11p pd=2.12e+06u as=0p ps=0u
-M1002 VGND A a_27_47# VNB nshort w=520000u l=150000u
-+  ad=1.768e+11p pd=1.72e+06u as=1.612e+11p ps=1.66e+06u
-M1003 X a_27_47# VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__inv_1 Y A VPB VNB VGND VPWR
-M1000 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=2.015e+11p ps=1.92e+06u
-M1001 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=2.7e+11p ps=2.54e+06u
-.ends
-.subckt sky130_fd_sc_hdll__and2_2 VPWR VGND A X B VPB VNB
-M1000 X a_27_75# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=4.1e+11p pd=2.82e+06u as=8.191e+11p ps=6.94e+06u
-M1001 X a_27_75# VGND VNB nshort w=650000u l=150000u
-+  ad=3.185e+11p pd=2.28e+06u as=4.656e+11p ps=4.16e+06u
-M1002 a_27_75# A VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1003 VGND a_27_75# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND B a_123_75# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1005 VPWR a_27_75# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR B a_27_75# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_123_75# A a_27_75# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
-.ends
-.subckt sky130_fd_sc_hdll__nor4b_1 C B A D_N Y VPB VNB VGND VPWR
-M1000 a_263_297# C a_169_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.5e+11p pd=2.7e+06u as=2.9e+11p ps=2.58e+06u
-M1001 a_169_297# a_91_199# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.3e+11p ps=3.06e+06u
-M1002 a_91_199# D_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=4.799e+11p ps=3.07e+06u
-M1003 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=3.835e+11p pd=3.78e+06u as=8.046e+11p ps=6.45e+06u
-M1004 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A a_369_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1006 Y a_91_199# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_91_199# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1009 a_369_297# B a_263_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a211oi_1 A1 C1 B1 Y A2 VPWR VGND VPB VNB
-M1000 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.05e+11p pd=2.61e+06u as=6.45e+11p ps=5.29e+06u
-M1001 Y C1 a_325_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.6e+11p pd=2.72e+06u as=3.15e+11p ps=2.63e+06u
-M1002 a_123_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.8525e+11p pd=1.87e+06u as=4.3875e+11p ps=3.95e+06u
-M1003 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.1025e+11p ps=4.17e+06u
-M1005 a_325_297# B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A1 a_123_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sedfxbp_2 VPWR VGND CLK Q_N SCD DE D Q SCE VPB VNB
-M1000 a_1787_159# a_1611_413# VPWR VPB phighvt w=750000u l=180000u
-+  ad=2.025e+11p pd=2.04e+06u as=2.49535e+12p ps=2.217e+07u
-M1001 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.7892e+12p ps=1.767e+07u
-M1002 a_2165_413# a_1787_159# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1003 a_2266_413# a_27_47# a_2165_413# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1004 VGND a_851_264# a_2414_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.32e+11p ps=1.49e+06u
-M1005 VPWR a_2266_413# a_851_264# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1006 VPWR DE a_455_324# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1007 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1008 VPWR a_2266_413# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1009 a_319_47# a_851_264# a_779_47# VNB nshort w=420000u l=150000u
-+  ad=2.478e+11p pd=2.86e+06u as=1.932e+11p ps=1.76e+06u
-M1010 a_2181_47# a_1787_159# VGND VNB nshort w=420000u l=150000u
-+  ad=1.356e+11p pd=1.51e+06u as=0p ps=0u
-M1011 VPWR a_851_264# Q_N VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1012 a_2266_413# a_211_363# a_2181_47# VNB nshort w=360000u l=150000u
-+  ad=1.908e+11p pd=1.78e+06u as=0p ps=0u
-M1013 a_1611_413# a_27_47# a_985_47# VNB nshort w=360000u l=150000u
-+  ad=1.404e+11p pd=1.5e+06u as=6.015e+11p ps=4.57e+06u
-M1014 a_985_47# a_955_21# a_1376_369# VPB phighvt w=640000u l=180000u
-+  ad=4.837e+11p pd=4.13e+06u as=2.24e+11p ps=1.98e+06u
-M1015 VGND SCE a_955_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1016 Q a_2266_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_851_264# Q_N VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1018 VGND a_2266_413# a_851_264# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1019 a_985_47# a_955_21# a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Q_N a_851_264# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_2414_47# a_27_47# a_2266_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR SCE a_955_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.76e+11p ps=1.83e+06u
-M1023 a_409_369# D a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=1.472e+11p pd=1.74e+06u as=3.84e+11p ps=3.76e+06u
-M1024 a_985_47# SCE a_1373_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1025 a_787_369# DE VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.432e+11p pd=2.04e+06u as=0p ps=0u
-M1026 a_319_47# a_851_264# a_787_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1611_413# a_211_363# a_985_47# VPB phighvt w=420000u l=180000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1028 VPWR a_1787_159# a_1712_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.617e+11p ps=1.61e+06u
-M1029 VPWR a_455_324# a_409_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_985_47# SCE a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_2266_413# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.405e+11p ps=2.04e+06u
-M1032 a_1712_413# a_27_47# a_1611_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Q_N a_851_264# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND DE a_455_324# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1035 a_779_47# a_455_324# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1376_369# SCD VPWR VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1038 a_1373_119# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_851_264# a_2360_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.058e+11p ps=1.82e+06u
-M1040 VGND a_1787_159# a_1738_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.518e+11p ps=1.6e+06u
-M1041 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1042 a_1738_47# a_211_363# a_1611_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_413_47# D a_319_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1044 Q a_2266_413# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VGND DE a_413_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_2360_413# a_211_363# a_2266_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_1787_159# a_1611_413# VGND VNB nshort w=640000u l=150000u
-+  ad=1.664e+11p pd=1.8e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a32oi_2 A2 B2 A3 A1 Y B1 VNB VPB VGND VPWR
-M1000 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.08e+12p pd=1.016e+07u as=1.71e+12p ps=1.542e+07u
-M1001 a_27_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1002 a_27_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=5.46e+11p pd=5.58e+06u as=6.4675e+11p ps=5.89e+06u
-M1003 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=0p ps=0u
-M1005 a_27_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A3 a_757_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.81e+11p ps=4.08e+06u
-M1007 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_507_47# A2 a_757_47# VNB nshort w=650000u l=150000u
-+  ad=5.135e+11p pd=5.48e+06u as=0p ps=0u
-M1009 VPWR A3 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_507_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A1 a_507_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_757_47# A2 a_507_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_757_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and4b_4 X D C B A_N VNB VPB VGND VPWR
-M1000 a_184_21# a_27_47# a_814_47# VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=2.47e+11p ps=2.06e+06u
-M1001 a_718_47# C a_624_47# VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=2.08e+11p ps=1.94e+06u
-M1002 a_624_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.205e+11p ps=6.17e+06u
-M1003 VPWR A_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=1.6157e+12p pd=1.333e+07u as=1.134e+11p ps=1.38e+06u
-M1004 a_184_21# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6.4e+11p pd=5.28e+06u as=0p ps=0u
-M1005 a_814_47# B a_718_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_184_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1007 X a_184_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_184_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1009 VPWR C a_184_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_184_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_184_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_27_47# a_184_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1014 VGND a_184_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_184_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_184_21# D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_184_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand2_2 Y A B VPB VNB VGND VPWR
-M1000 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=8.3e+11p pd=7.66e+06u as=5.8e+11p ps=5.16e+06u
-M1001 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=5.135e+11p pd=5.48e+06u as=2.405e+11p ps=2.04e+06u
-M1002 Y A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=2.405e+11p pd=2.04e+06u as=0p ps=0u
-M1003 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a31o_4 B1 A2 A3 A1 X VNB VPB VGND VPWR
-M1000 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.47e+12p pd=1.294e+07u as=1.76e+12p ps=1.552e+07u
-M1001 a_213_47# A2 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=2.08e+11p ps=1.94e+06u
-M1002 a_27_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_297_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1004 VGND a_297_47# X VNB nshort w=650000u l=150000u
-+  ad=1.404e+12p pd=1.082e+07u as=4.16e+11p ps=3.88e+06u
-M1005 a_297_47# A1 a_213_47# VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1006 VPWR a_297_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A3 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_297_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# B1 a_297_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1010 VGND a_297_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B1 a_297_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_297_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_495_47# A2 a_401_47# VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=2.08e+11p ps=1.94e+06u
-M1015 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_119_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_401_47# A1 a_297_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_297_47# B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A3 a_495_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_297_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_297_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_297_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__xnor3_4 X B C A VNB VPB VGND VPWR
-M1000 X a_101_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.50095e+12p ps=1.307e+07u
-M1001 a_1490_297# a_1207_297# VGND VNB nshort w=640000u l=150000u
-+  ad=5.677e+11p pd=4.42e+06u as=1.0748e+12p ps=9.85e+06u
-M1002 a_532_93# C VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.856e+11p pd=1.86e+06u as=0p ps=0u
-M1003 VGND A a_1207_297# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=4.44e+11p ps=3.96e+06u
-M1004 a_1089_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
-M1005 VGND a_101_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1006 a_657_325# B a_1207_297# VNB nshort w=640000u l=150000u
-+  ad=5.835e+11p pd=4.49e+06u as=0p ps=0u
-M1007 VGND a_101_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_681_49# B a_1207_297# VPB phighvt w=840000u l=180000u
-+  ad=8.3175e+11p pd=5.4e+06u as=7.226e+11p ps=5.29e+06u
-M1009 X a_101_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1207_297# a_1089_297# a_657_325# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=5.878e+11p ps=4.8e+06u
-M1011 a_1490_297# a_1089_297# a_657_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_101_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1490_297# a_1207_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=7.998e+11p pd=5.68e+06u as=0p ps=0u
-M1014 a_681_49# B a_1490_297# VNB nshort w=640000u l=150000u
-+  ad=5.4845e+11p pd=4.32e+06u as=0p ps=0u
-M1015 a_1207_297# a_1089_297# a_681_49# VNB nshort w=600000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_657_325# B a_1490_297# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_101_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A a_1207_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_101_21# C a_657_325# VPB phighvt w=840000u l=180000u
-+  ad=3.227e+11p pd=2.67e+06u as=0p ps=0u
-M1020 a_657_325# a_532_93# a_101_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.432e+11p ps=2.04e+06u
-M1021 a_1490_297# a_1089_297# a_681_49# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_101_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_101_21# C a_681_49# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_101_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_681_49# a_532_93# a_101_21# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_532_93# C VGND VNB nshort w=420000u l=150000u
-+  ad=1.995e+11p pd=1.79e+06u as=0p ps=0u
-M1027 a_1089_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.2e+11p pd=2.64e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a21bo_2 B1_N A2 X A1 VNB VPB VGND VPWR
-M1000 a_621_47# A1 a_79_21# VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=2.145e+11p ps=1.96e+06u
-M1001 VPWR A1 a_523_297# VPB phighvt w=1e+06u l=180000u
-+  ad=9.372e+11p pd=8.18e+06u as=5.7e+11p ps=5.14e+06u
-M1002 VGND A2 a_621_47# VNB nshort w=650000u l=150000u
-+  ad=7.8875e+11p pd=7.68e+06u as=0p ps=0u
-M1003 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1004 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.47e+11p ps=2.06e+06u
-M1005 a_523_297# a_317_93# a_79_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1006 a_317_93# B1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1007 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_317_93# B1_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1009 a_523_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_79_21# a_317_93# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__mux2i_2 Y A1 A0 S VNB VPB VPWR VGND
-M1000 Y A0 a_401_47# VNB nshort w=650000u l=150000u
-+  ad=7.3125e+11p pd=6.15e+06u as=4.16e+11p ps=3.88e+06u
-M1001 a_211_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=8.5e+11p ps=7.7e+06u
-M1002 a_213_47# S VGND VNB nshort w=650000u l=150000u
-+  ad=4.1925e+11p pd=3.89e+06u as=5.85e+11p ps=5.7e+06u
-M1003 a_401_47# A0 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_211_297# A0 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.065e+12p ps=8.13e+06u
-M1005 VPWR S a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1006 VPWR a_27_47# a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.85e+11p ps=5.17e+06u
-M1007 a_213_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_27_47# a_401_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_399_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A1 a_399_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND S a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1012 a_401_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_399_297# A1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR S a_211_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A0 a_211_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND S a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A1 a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__decap_3 VPWR VGND VPB VNB
-M1000 VPWR VGND VPWR VPB phighvt w=870000u l=590000u
-+  ad=4.524e+11p pd=4.52e+06u as=0p ps=0u
-M1001 VGND VPWR VGND VNB nshort w=550000u l=590000u
-+  ad=2.86e+11p pd=3.24e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a31oi_2 A3 B1 Y A1 A2 VNB VPB VPWR VGND
-M1000 Y A1 a_297_47# VNB nshort w=650000u l=150000u
-+  ad=6.37e+11p pd=5.86e+06u as=4.68e+11p ps=4.04e+06u
-M1001 a_27_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.5e+12p pd=1.3e+07u as=1.47e+12p ps=8.94e+06u
-M1002 a_27_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=5.46e+11p pd=5.58e+06u as=4.68e+11p ps=4.04e+06u
-M1003 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_297_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_297_47# A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A3 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.7e+11p pd=2.74e+06u as=0p ps=0u
-M1009 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A3 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_47# A2 a_297_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__conb_1 LO HI VPB VNB VGND VPWR
-R0 VGND LO short w=480000u l=45000u
-R1 HI VPWR short w=480000u l=45000u
-.ends
-.subckt sky130_fd_sc_hdll__dlrtn_2 RESET_B D GATE_N Q VGND VPWR VPB VNB
-M1000 VGND a_750_21# a_708_47# VNB nshort w=420000u l=150000u
-+  ad=8.0475e+11p pd=8.18e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR GATE_N a_27_363# VPB phighvt w=640000u l=180000u
-+  ad=1.411e+12p pd=1.231e+07u as=1.728e+11p ps=1.82e+06u
-M1002 VPWR a_750_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1003 a_203_47# a_27_363# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1004 VPWR a_750_21# a_702_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1005 VGND a_750_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1006 a_503_369# a_319_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=0p ps=0u
-M1007 a_708_47# a_203_47# a_604_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1008 Q a_750_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Q a_750_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND D a_319_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1011 VPWR D a_319_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1012 VGND RESET_B a_981_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.6575e+11p ps=1.81e+06u
-M1013 a_604_47# a_27_363# a_500_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1014 VPWR RESET_B a_750_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1015 a_981_47# a_604_47# a_750_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1016 VGND GATE_N a_27_363# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1017 a_702_413# a_27_363# a_604_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1018 a_203_47# a_27_363# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1019 a_604_47# a_203_47# a_503_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_500_47# a_319_369# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_750_21# a_604_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or2b_2 A B_N X VPWR VGND VNB VPB
-M1000 VGND B_N a_27_53# VNB nshort w=420000u l=150000u
-+  ad=7.764e+11p pd=6.48e+06u as=1.302e+11p ps=1.46e+06u
-M1001 a_228_297# a_27_53# VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1002 VPWR a_228_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=7.191e+11p pd=6.69e+06u as=4.8e+11p ps=2.96e+06u
-M1003 a_27_53# B_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1004 a_318_297# a_27_53# a_228_297# VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=1.134e+11p ps=1.38e+06u
-M1005 VPWR A a_318_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_228_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.315e+11p ps=2.32e+06u
-M1007 X a_228_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_228_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A a_228_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__diode_8 VNB VPB VGND VPWR DIODE
-D0 VNB DIODE ndiode p=1.858e+07u a=3.5464e+12p
-.ends
-.subckt sky130_fd_sc_hdll__sdfxtp_1 VPWR VGND CLK Q SCD D SCE VPB VNB
-M1000 VPWR a_1189_21# a_1121_413# VPB phighvt w=420000u l=180000u
-+  ad=1.3699e+12p pd=1.231e+07u as=1.47e+11p ps=1.54e+06u
-M1001 VGND a_1474_413# a_1647_21# VNB nshort w=650000u l=150000u
-+  ad=1.0782e+12p pd=1.048e+07u as=2.015e+11p ps=1.92e+06u
-M1002 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1003 a_608_369# D a_507_47# VNB nshort w=420000u l=150000u
-+  ad=2.604e+11p pd=2.88e+06u as=1.638e+11p ps=1.62e+06u
-M1004 a_1474_413# a_27_47# a_1189_21# VPB phighvt w=420000u l=180000u
-+  ad=1.26e+11p pd=1.44e+06u as=2.4195e+11p ps=2.22e+06u
-M1005 VGND a_1189_21# a_1117_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.446e+11p ps=1.56e+06u
-M1006 a_504_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.176e+11p pd=1.96e+06u as=0p ps=0u
-M1007 a_203_47# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1008 VGND a_1647_21# a_1581_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.338e+11p ps=1.5e+06u
-M1009 VPWR SCE a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1010 VPWR a_1647_21# a_1570_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.659e+11p ps=1.63e+06u
-M1011 a_1121_413# a_27_47# a_1011_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.407e+11p ps=1.51e+06u
-M1012 a_1189_21# a_1011_47# VGND VNB nshort w=640000u l=150000u
-+  ad=2.104e+11p pd=2.06e+06u as=0p ps=0u
-M1013 VGND SCE a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.428e+11p ps=1.52e+06u
-M1014 a_1011_47# a_203_47# a_608_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=3.2e+11p ps=3.34e+06u
-M1015 a_1570_413# a_203_47# a_1474_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Q a_1647_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1017 a_203_47# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1018 a_1474_413# a_203_47# a_1189_21# VNB nshort w=360000u l=150000u
-+  ad=1.35e+11p pd=1.47e+06u as=0p ps=0u
-M1019 VPWR SCD a_702_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=2.144e+11p ps=1.95e+06u
-M1020 VGND SCD a_721_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=9.66e+10p ps=1.3e+06u
-M1021 a_507_47# a_319_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_702_369# a_319_47# a_608_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1117_47# a_203_47# a_1011_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.368e+11p ps=1.48e+06u
-M1024 VPWR a_1474_413# a_1647_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1025 a_1189_21# a_1011_47# VPWR VPB phighvt w=750000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1011_47# a_27_47# a_608_369# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1581_47# a_27_47# a_1474_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1029 a_721_47# SCE a_608_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_608_369# D a_504_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Q a_1647_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a211o_4 VNB VPB VGND VPWR C1 B1 X A2 A1
-M1000 VPWR A2 a_523_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.55e+12p pd=1.31e+07u as=1.25e+12p ps=1.05e+07u
-M1001 X a_79_204# VGND VNB nshort w=650000u l=150000u
-+  ad=4.7125e+11p pd=4.05e+06u as=1.43325e+12p ps=1.221e+07u
-M1002 a_1051_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.82e+11p pd=1.86e+06u as=0p ps=0u
-M1003 VPWR a_79_204# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=6e+11p ps=5.2e+06u
-M1004 VGND a_79_204# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_79_204# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_79_204# C1 a_613_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=3e+11p ps=2.6e+06u
-M1007 a_79_204# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=7.41e+11p pd=6.18e+06u as=0p ps=0u
-M1008 VPWR A1 a_523_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_79_204# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_79_204# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_79_204# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_79_204# C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND B1 a_79_204# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1243_47# A1 a_79_204# VNB nshort w=650000u l=150000u
-+  ad=1.82e+11p pd=1.86e+06u as=0p ps=0u
-M1015 a_523_297# B1 a_805_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.4e+11p ps=2.68e+06u
-M1016 a_79_204# A1 a_1051_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_613_297# B1 a_523_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_523_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A2 a_1243_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_79_204# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_523_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_805_297# C1 a_79_204# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND C1 a_79_204# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a2bb2oi_2 A2_N A1_N Y B2 B1 VNB VPB VGND VPWR
-M1000 a_27_297# B2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.12e+12p pd=1.024e+07u as=8.7e+11p ps=7.74e+06u
-M1001 a_695_297# A2_N a_455_21# VPB phighvt w=1e+06u l=180000u
-+  ad=8.5e+11p pd=7.7e+06u as=2.9e+11p ps=2.58e+06u
-M1002 a_27_297# a_455_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1003 Y B2 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=3.835e+11p ps=3.78e+06u
-M1004 a_455_21# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=4.81e+11p pd=4.08e+06u as=1.2805e+12p ps=1.044e+07u
-M1005 VPWR B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2_N a_455_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_455_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_455_21# A2_N a_695_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_119_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_695_297# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A1_N a_455_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_455_21# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y a_455_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_455_21# A2_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A1_N a_695_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_119_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a21o_4 A2 A1 X B1 VNB VPB VGND VPWR
-M1000 VGND B1 a_84_21# VNB nshort w=650000u l=150000u
-+  ad=1.365e+12p pd=1.07e+07u as=4.81e+11p ps=4.08e+06u
-M1001 a_523_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.255e+12p pd=1.051e+07u as=1.47e+12p ps=1.294e+07u
-M1002 X a_84_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.29e+11p pd=3.92e+06u as=0p ps=0u
-M1003 VPWR a_84_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=6e+11p ps=5.2e+06u
-M1004 VPWR A2 a_523_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_84_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_84_21# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_801_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.82e+11p pd=1.86e+06u as=0p ps=0u
-M1008 VGND a_84_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_991_47# A1 a_84_21# VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=0p ps=0u
-M1010 VGND A2 a_991_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_523_297# B1 a_84_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1012 VPWR a_84_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_523_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_84_21# B1 a_523_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A1 a_523_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_84_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_84_21# A1 a_801_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_84_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_84_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__dlygate4sd1_1 A X VPWR VGND VPB VNB
-M1000 a_213_47# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=5.039e+11p ps=3.97e+06u
-M1001 X a_319_93# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1002 VPWR a_213_47# a_319_93# VPB phighvt w=420000u l=180000u
-+  ad=6.233e+11p pd=4.51e+06u as=1.176e+11p ps=1.4e+06u
-M1003 X a_319_93# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1004 a_213_47# a_27_47# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1005 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1006 VGND a_213_47# a_319_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1007 VPWR A a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-.ends
-.subckt sky130_fd_sc_hdll__sdfxbp_2 VPWR VGND Q_N Q CLK SCE D SCD VNB VPB
-M1000 VPWR a_1179_183# a_1111_413# VPB phighvt w=420000u l=180000u
-+  ad=2.67555e+12p pd=2.099e+07u as=1.47e+11p ps=1.54e+06u
-M1001 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.9813e+12p ps=1.723e+07u
-M1002 a_1179_183# a_1001_47# VGND VNB nshort w=640000u l=150000u
-+  ad=1.978e+11p pd=1.99e+06u as=0p ps=0u
-M1003 VPWR a_1653_315# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1004 VGND a_2234_47# Q_N VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1005 VPWR a_2234_47# Q_N VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1006 Q_N a_2234_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR SCD a_698_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=2.144e+11p ps=1.95e+06u
-M1008 a_1464_413# a_27_47# a_1179_183# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.307e+11p ps=2.19e+06u
-M1009 a_1001_47# a_27_47# a_604_369# VNB nshort w=360000u l=150000u
-+  ad=1.548e+11p pd=1.58e+06u as=2.604e+11p ps=2.88e+06u
-M1010 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1011 a_698_369# a_319_47# a_604_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=2.99e+11p ps=3.24e+06u
-M1012 Q_N a_2234_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Q a_1653_315# VGND VNB nshort w=650000u l=150000u
-+  ad=2.08e+11p pd=1.94e+06u as=0p ps=0u
-M1014 a_604_369# D a_529_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1015 VPWR a_1464_413# a_1653_315# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1016 a_503_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.08e+11p pd=1.93e+06u as=0p ps=0u
-M1017 VGND a_1179_183# a_1117_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.374e+11p ps=1.52e+06u
-M1018 VPWR a_1653_315# a_2234_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1019 a_717_47# SCE a_604_369# VNB nshort w=420000u l=150000u
-+  ad=9.66e+10p pd=1.3e+06u as=0p ps=0u
-M1020 a_604_369# D a_503_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND SCE a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1022 VPWR SCE a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1023 a_1111_413# a_27_47# a_1001_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.407e+11p ps=1.51e+06u
-M1024 VGND a_1653_315# a_1615_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.446e+11p ps=1.55e+06u
-M1025 a_1179_183# a_1001_47# VPWR VPB phighvt w=750000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Q a_1653_315# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_1653_315# a_2234_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1028 a_1001_47# a_211_363# a_604_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1030 a_1464_413# a_211_363# a_1179_183# VNB nshort w=360000u l=150000u
-+  ad=1.854e+11p pd=1.75e+06u as=0p ps=0u
-M1031 a_529_47# a_319_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR a_1653_315# a_1558_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.037e+11p ps=1.81e+06u
-M1033 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1034 a_1117_47# a_211_363# a_1001_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_1653_315# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1558_413# a_211_363# a_1464_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND SCD a_717_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1615_47# a_27_47# a_1464_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND a_1464_413# a_1653_315# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-.ends
-.subckt sky130_fd_sc_hdll__nor2b_2 B_N A Y VPB VNB VGND VPWR
-M1000 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=4.034e+11p pd=3.96e+06u as=8.5e+11p ps=7.7e+06u
-M1001 a_27_297# a_271_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1002 VPWR B_N a_271_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.806e+11p ps=1.7e+06u
-M1003 Y a_271_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=6.8595e+11p ps=7.07e+06u
-M1005 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_271_21# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_271_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B_N a_271_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=1.68e+06u
-.ends
-.subckt sky130_fd_sc_hdll__nor4_8 A C D B Y VPB VNB VGND VPWR
-M1000 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.57e+12p pd=2.314e+07u as=1.16e+12p ps=1.032e+07u
-M1001 a_869_297# C a_1635_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.32e+12p pd=2.064e+07u as=2.58e+12p ps=2.316e+07u
-M1002 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=2.808e+12p pd=2.944e+07u as=4.355e+12p ps=3.55e+07u
-M1003 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_297# B a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_1635_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1007 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_869_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y D a_1635_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_869_297# C a_1635_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_869_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1635_297# C a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1635_297# C a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y D a_1635_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_869_297# C a_1635_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1635_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_869_297# C a_1635_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_27_297# B a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y D a_1635_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1635_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_27_297# B a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_1635_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_869_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 a_1635_297# C a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 a_27_297# B a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 a_869_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 a_1635_297# C a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 Y D a_1635_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1061 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__einvp_4 TE A Z VPWR VGND VPB VNB
-M1000 a_213_47# TE VGND VNB nshort w=650000u l=150000u
-+  ad=1.0205e+12p pd=9.64e+06u as=5.98e+11p ps=5.74e+06u
-M1001 a_213_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1002 Z A a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_27_47# a_235_309# VPB phighvt w=940000u l=180000u
-+  ad=8.152e+11p pd=7.46e+06u as=1.4263e+12p ps=1.269e+07u
-M1004 VPWR TE a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1005 a_235_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1006 VGND TE a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_213_47# TE VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_213_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Z A a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND TE a_213_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_235_309# a_27_47# VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Z A a_235_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND TE a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1014 a_235_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_27_47# a_235_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_235_309# a_27_47# VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Z A a_235_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__muxb8to1_1 VGND Z VPWR VNB VPB D[0] S[0] S[1] D[1] D[2]
-+ S[2] S[3] D[4] S[4] S[5] D[5] D[6] S[6] S[7] D[7] D[3]
-M1000 a_1765_47# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=1.8759e+12p ps=1.712e+07u
-M1001 a_937_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1002 a_2593_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1003 a_1773_297# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=3.19e+12p ps=2.438e+07u
-M1004 VGND S[6] a_2668_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1005 a_1361_47# S[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1006 VPWR D[7] a_3218_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.297e+11p ps=2.69e+06u
-M1007 Z a_1840_265# a_1773_297# VPB phighvt w=820000u l=180000u
-+  ad=1.7712e+12p pd=1.744e+07u as=0p ps=0u
-M1008 a_1574_47# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=1.0816e+12p ps=1.248e+07u
-M1009 a_734_333# a_533_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1010 Z S[2] a_937_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_3017_47# S[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1012 a_2402_47# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1013 a_1562_333# a_1361_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1014 a_746_47# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1015 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1016 VPWR D[3] a_1562_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_2601_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1018 Z S[4] a_1765_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Z a_184_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_533_47# S[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1021 a_945_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1022 Z a_1012_265# a_945_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR S[0] a_184_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1024 a_2189_47# S[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1025 VPWR S[2] a_1012_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1026 Z a_2668_265# a_2601_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1361_47# S[3] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1028 a_533_47# S[1] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1029 VGND S[0] a_184_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1030 a_2390_333# a_2189_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1031 a_3230_47# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1032 VGND D[1] a_746_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Z S[6] a_2593_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR S[6] a_2668_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1035 VPWR D[1] a_734_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR D[5] a_2390_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_2189_47# S[5] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1038 VPWR S[4] a_1840_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1039 VGND D[3] a_1574_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_109_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1041 VGND D[5] a_2402_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VGND S[2] a_1012_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1043 VGND D[7] a_3230_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 Z S[0] a_109_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_3218_333# a_3017_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VGND S[4] a_1840_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1047 a_3017_47# S[7] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o2bb2a_1 A1_N X A2_N B2 B1 VNB VPB VPWR VGND
-M1000 VPWR A2_N a_224_369# VPB phighvt w=420000u l=180000u
-+  ad=8.398e+11p pd=6.8e+06u as=2.664e+11p ps=2.4e+06u
-M1001 a_225_47# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.323e+11p pd=1.47e+06u as=3.9885e+11p ps=3.76e+06u
-M1002 VPWR a_76_199# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1003 VGND B2 a_529_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1004 a_224_369# A2_N a_225_47# VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1005 a_633_369# B2 a_76_199# VPB phighvt w=420000u l=180000u
-+  ad=1.638e+11p pd=1.62e+06u as=1.47e+11p ps=1.54e+06u
-M1006 a_224_369# A1_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B1 a_633_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_529_47# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_76_199# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1010 a_529_47# a_224_369# a_76_199# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1011 a_76_199# a_224_369# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or3_1 A X B C VPWR VGND VPB VNB
-M1000 X a_29_53# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=4.95e+11p pd=2.99e+06u as=3.107e+11p ps=2.72e+06u
-M1001 VGND C a_29_53# VNB nshort w=420000u l=150000u
-+  ad=3.4965e+11p pd=3.46e+06u as=2.856e+11p ps=3.04e+06u
-M1002 a_119_297# C a_29_53# VPB phighvt w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.134e+11p ps=1.38e+06u
-M1003 VPWR A a_203_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.428e+11p ps=1.52e+06u
-M1004 X a_29_53# VGND VNB nshort w=650000u l=150000u
-+  ad=3.1525e+11p pd=2.27e+06u as=0p ps=0u
-M1005 VGND A a_29_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_203_297# B a_119_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_29_53# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and4b_2 VPWR VGND X A_N D C B VNB VPB
-M1000 VPWR D a_211_413# VPB phighvt w=420000u l=180000u
-+  ad=8.563e+11p pd=8.28e+06u as=4.683e+11p ps=3.91e+06u
-M1001 VPWR A_N a_27_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1002 VGND D a_519_47# VNB nshort w=420000u l=150000u
-+  ad=5.3965e+11p pd=5.38e+06u as=1.449e+11p ps=1.53e+06u
-M1003 VGND a_211_413# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.3075e+11p ps=2.01e+06u
-M1004 X a_211_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.25e+11p pd=2.65e+06u as=0p ps=0u
-M1005 a_399_47# B a_317_47# VNB nshort w=420000u l=150000u
-+  ad=1.89e+11p pd=1.74e+06u as=1.092e+11p ps=1.36e+06u
-M1006 VPWR B a_211_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_211_413# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_413# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1009 a_211_413# C VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_317_47# a_27_413# a_211_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1011 a_211_413# a_27_413# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_211_413# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_519_47# C a_399_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o22ai_1 B2 A1 Y B1 A2 VPB VNB VPWR VGND
-M1000 VGND A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=7.605e+11p ps=6.24e+06u
-M1001 VPWR A1 a_384_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.5e+11p pd=5.1e+06u as=2.3e+11p ps=2.46e+06u
-M1002 a_384_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.6e+11p ps=3.12e+06u
-M1003 a_27_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.5675e+11p ps=2.09e+06u
-M1004 a_117_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=4.15e+11p pd=2.83e+06u as=0p ps=0u
-M1005 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a31o_2 X B1 A3 A1 A2 VNB VPB VGND VPWR
-M1000 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=9.1e+11p pd=7.82e+06u as=2.9e+11p ps=2.58e+06u
-M1001 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=5.46e+11p pd=5.58e+06u as=2.405e+11p ps=2.04e+06u
-M1002 a_79_21# A1 a_391_47# VNB nshort w=650000u l=150000u
-+  ad=3.38e+11p pd=2.34e+06u as=2.47e+11p ps=2.06e+06u
-M1003 VGND B1 a_79_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_305_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=6.4e+11p pd=5.28e+06u as=0p ps=0u
-M1005 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A2 a_305_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_79_21# B1 a_305_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.3e+11p pd=2.66e+06u as=0p ps=0u
-M1008 a_305_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_391_47# A2 a_307_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1011 a_307_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__xnor3_2 X B C A VNB VPB VGND VPWR
-M1000 a_477_49# a_328_93# a_79_21# VPB phighvt w=840000u l=180000u
-+  ad=8.3175e+11p pd=5.4e+06u as=3.227e+11p ps=2.67e+06u
-M1001 a_1286_297# a_885_297# a_453_325# VNB nshort w=420000u l=150000u
-+  ad=7.149e+11p pd=4.88e+06u as=6.411e+11p ps=4.67e+06u
-M1002 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=8.543e+11p pd=7.87e+06u as=2.405e+11p ps=2.04e+06u
-M1003 a_328_93# C VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.856e+11p pd=1.86e+06u as=1.22095e+12p ps=1.051e+07u
-M1004 a_477_49# B a_1286_297# VNB nshort w=640000u l=150000u
-+  ad=5.4545e+11p pd=4.31e+06u as=0p ps=0u
-M1005 a_885_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.2e+11p pd=2.64e+06u as=0p ps=0u
-M1006 a_453_325# B a_1286_297# VPB phighvt w=640000u l=180000u
-+  ad=6.39e+11p pd=4.96e+06u as=9.286e+11p ps=5.88e+06u
-M1007 a_79_21# C a_477_49# VNB nshort w=640000u l=150000u
-+  ad=1.856e+11p pd=1.86e+06u as=0p ps=0u
-M1008 a_453_325# a_328_93# a_79_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_328_93# C VGND VNB nshort w=420000u l=150000u
-+  ad=1.995e+11p pd=1.79e+06u as=0p ps=0u
-M1010 a_477_49# B a_1003_297# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=7.226e+11p ps=5.29e+06u
-M1011 a_1286_297# a_1003_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1003_297# a_885_297# a_477_49# VNB nshort w=600000u l=150000u
-+  ad=4.4975e+11p pd=3.99e+06u as=0p ps=0u
-M1013 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.1e+11p pd=2.62e+06u as=0p ps=0u
-M1014 a_1003_297# a_885_297# a_453_325# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_453_325# B a_1003_297# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_79_21# C a_453_325# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1286_297# a_885_297# a_477_49# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A a_1003_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1286_297# a_1003_297# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A a_1003_297# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_885_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=1.6515e+11p pd=1.82e+06u as=0p ps=0u
-M1023 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand2b_1 Y A_N B VPB VNB VGND VPWR
-M1000 VPWR A_N a_27_93# VPB phighvt w=420000u l=180000u
-+  ad=5.757e+11p pd=5.25e+06u as=1.134e+11p ps=1.38e+06u
-M1001 VPWR a_27_93# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1002 VGND A_N a_27_93# VNB nshort w=420000u l=150000u
-+  ad=2.33e+11p pd=2.07e+06u as=1.302e+11p ps=1.46e+06u
-M1003 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y a_27_93# a_226_47# VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=1.755e+11p ps=1.84e+06u
-M1005 a_226_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand4bb_4 B_N A_N C Y D VNB VPB VGND VPWR
-M1000 a_1251_47# C a_853_47# VNB nshort w=650000u l=150000u
-+  ad=1.02375e+12p pd=9.65e+06u as=8.645e+11p ps=7.86e+06u
-M1001 a_206_47# B_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=4.55e+11p pd=2.91e+06u as=3.425e+12p ps=2.685e+07u
-M1002 a_395_47# a_206_47# a_853_47# VNB nshort w=650000u l=150000u
-+  ad=9.62e+11p pd=9.46e+06u as=0p ps=0u
-M1003 Y a_206_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.32e+12p pd=2.064e+07u as=0p ps=0u
-M1004 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_27_47# a_395_47# VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=0p ps=0u
-M1008 a_853_47# a_206_47# a_395_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_853_47# C a_1251_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1251_47# C a_853_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_206_47# B_N VGND VNB nshort w=650000u l=150000u
-+  ad=3.12e+11p pd=2.26e+06u as=6.0125e+11p ps=5.75e+06u
-M1014 VPWR A_N a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1015 VPWR a_206_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1251_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND D a_1251_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y a_206_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_853_47# C a_1251_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1022 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_395_47# a_206_47# a_853_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1251_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_853_47# a_206_47# a_395_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND D a_1251_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_206_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_395_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y a_27_47# a_395_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_395_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o211ai_1 A1 A2 Y C1 B1 VPB VNB VGND VPWR
-M1000 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=3.9325e+11p ps=3.81e+06u
-M1001 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A2 a_118_297# VPB phighvt w=1e+06u l=180000u
-+  ad=9.2e+11p pd=5.84e+06u as=2.3e+11p ps=2.46e+06u
-M1003 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=6.2e+11p pd=5.24e+06u as=0p ps=0u
-M1004 Y C1 a_304_47# VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=2.46e+06u as=2.4375e+11p ps=2.05e+06u
-M1005 a_118_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_304_47# B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__muxb16to1_4 VGND Z VPWR VNB VPB S[6] S[10] D[12] D[13]
-+ D[8] D[15] D[10] D[9] D[14] S[14] D[11] S[11] S[8] S[15] S[12] S[9] S[13] D[3] D[0]
-+ D[4] D[5] D[2] D[1] D[6] S[2] S[3] S[7] S[0] S[1] S[4] S[5] D[7]
-M1000 a_2693_591# a_3135_793# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=7.6096e+12p ps=7.104e+07u
-M1001 a_2695_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=1.32704e+13p ps=1.36e+08u
-M1002 a_1643_311# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=2.03648e+13p ps=1.9232e+08u
-M1003 a_9513_66# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=4.4928e+12p ps=5.056e+07u
-M1004 a_7939_911# D[14] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1005 a_7939_911# S[14] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_5361_591# D[12] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1007 Z a_1430_325# a_1643_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1430_599# S[9] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1009 a_8379_265# S[6] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1010 a_2695_911# S[10] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1011 a_1643_613# D[9] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1012 VGND D[12] a_5363_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1013 Z a_9250_325# a_9463_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1014 VPWR D[0] a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1015 VPWR S[6] a_8379_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1016 VPWR S[4] a_5803_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1017 a_559_793# S[8] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1018 VPWR S[0] a_559_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1019 VGND D[9] a_1693_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1020 a_2693_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1021 VGND D[4] a_5363_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1022 a_6674_325# S[5] VPWR VPB phighvt w=820000u l=180000u
-+  ad=2.378e+11p pd=2.22e+06u as=0p ps=0u
-M1023 VPWR D[8] a_117_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1024 a_2693_591# D[10] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_7937_591# a_8379_793# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1026 Z a_559_793# a_117_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Z S[9] a_1693_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_8379_793# S[14] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1029 VGND D[5] a_6937_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1030 a_4269_66# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1031 Z S[3] a_4269_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1693_918# S[9] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND D[10] a_2695_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR S[13] a_6674_599# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1035 Z S[2] a_2695_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_2695_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND S[4] a_5803_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1038 VPWR D[1] a_1643_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 Z S[1] a_1693_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1040 VPWR D[7] a_9463_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VGND D[3] a_4269_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR D[3] a_4219_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1043 a_3135_793# S[10] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1044 a_5363_911# S[12] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_1693_66# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 Z a_6674_325# a_6887_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1047 a_4269_918# S[11] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1048 a_1643_311# a_1430_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VGND D[1] a_1693_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 a_5361_297# a_5803_265# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1051 VPWR D[9] a_1643_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VPWR D[11] a_4219_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1053 a_119_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1054 VGND S[11] a_4006_599# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1055 Z a_5803_793# a_5361_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 VPWR D[15] a_9463_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1057 a_6937_66# D[5] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 a_9463_311# a_9250_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 Z S[3] a_4269_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 VGND S[13] a_6674_599# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1061 a_559_265# S[0] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 VGND D[2] a_2695_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 a_8379_265# S[6] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 Z S[14] a_7939_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 a_3135_265# S[2] VPWR VPB phighvt w=820000u l=180000u
-+  ad=2.378e+11p pd=2.22e+06u as=0p ps=0u
-M1066 VPWR S[11] a_4006_599# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1067 VPWR D[2] a_2693_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1068 VGND D[7] a_9513_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 a_7939_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1070 Z S[8] a_119_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1071 a_4219_613# a_4006_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1072 a_4006_599# S[11] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1073 a_9513_918# D[15] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1074 Z S[0] a_119_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1075 VGND S[6] a_8379_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1076 VPWR D[10] a_2693_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 Z a_8379_793# a_7937_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1078 VGND S[8] a_559_793# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1079 a_117_591# a_559_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1080 Z a_3135_793# a_2693_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1081 a_7937_297# a_8379_265# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1082 a_2693_297# a_3135_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1083 VPWR S[10] a_3135_793# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1084 VGND D[0] a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1085 VGND D[8] a_119_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1086 a_5803_265# S[4] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1087 a_9463_311# D[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1088 VPWR D[5] a_6887_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1089 a_4219_311# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1090 a_119_911# D[8] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1091 a_5363_911# S[12] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1092 Z a_6674_599# a_6887_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1093 Z S[1] a_1693_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1094 a_6887_311# a_6674_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1095 a_5803_265# S[4] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1096 a_1693_918# S[9] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1097 VGND S[14] a_8379_793# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1098 a_1693_66# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1099 VPWR D[6] a_7937_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1100 a_4269_66# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1101 a_4219_613# D[11] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1102 VPWR D[13] a_6887_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1103 a_9463_613# D[15] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1104 Z S[15] a_9513_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1105 a_119_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1106 a_4269_66# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1107 VGND S[9] a_1430_599# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1108 a_2695_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1109 VPWR D[14] a_7937_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1110 a_2695_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1111 a_1693_918# D[9] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1112 a_1643_613# a_1430_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1113 a_1693_66# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1114 Z a_4006_599# a_4219_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1115 a_9513_66# D[7] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1116 VPWR D[3] a_4219_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1117 a_6887_613# a_6674_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1118 a_5361_297# a_5803_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1119 Z a_5803_793# a_5361_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1120 VPWR S[12] a_5803_793# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1121 a_4219_311# a_4006_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1122 VGND D[6] a_7939_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1123 VPWR S[8] a_559_793# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1124 VPWR S[14] a_8379_793# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1125 Z S[0] a_119_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1126 VGND S[5] a_6674_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1127 Z a_559_793# a_117_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1128 a_5363_911# D[12] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1129 VPWR D[11] a_4219_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1130 a_6674_599# S[13] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1131 a_9463_311# D[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1132 VGND D[13] a_6937_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1133 VPWR S[1] a_1430_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1134 a_1643_311# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1135 a_4269_66# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1136 a_6937_918# D[13] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1137 a_117_297# a_559_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1138 Z a_3135_265# a_2693_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1139 a_559_265# S[0] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1140 Z a_1430_325# a_1643_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1141 a_9250_325# S[7] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1142 VPWR S[7] a_9250_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1143 a_2695_911# D[10] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1144 VGND D[15] a_9513_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1145 a_9463_613# D[15] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1146 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1147 a_7939_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1148 a_1643_613# D[9] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1149 a_6937_918# S[13] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1150 a_4006_325# S[3] VPWR VPB phighvt w=820000u l=180000u
-+  ad=2.378e+11p pd=2.22e+06u as=0p ps=0u
-M1151 VPWR D[7] a_9463_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1152 a_6674_325# S[5] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1153 Z a_9250_325# a_9463_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1154 Z S[4] a_5363_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1155 a_117_591# D[8] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1156 VPWR D[15] a_9463_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1157 a_2693_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1158 VPWR D[4] a_5361_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1159 a_119_911# S[8] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1160 Z S[11] a_4269_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1161 Z a_1430_599# a_1643_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1162 Z S[14] a_7939_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1163 a_9463_311# a_9250_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1164 a_2693_591# D[10] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1165 VPWR D[12] a_5361_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1166 Z a_9250_599# a_9463_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1167 VGND D[1] a_1693_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1168 Z a_8379_265# a_7937_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1169 a_9513_918# S[15] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1170 a_8379_793# S[14] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1171 Z a_4006_325# a_4219_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1172 a_559_793# S[8] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1173 a_3135_793# S[10] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1174 a_9250_599# S[15] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1175 a_6937_66# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1176 VPWR D[6] a_7937_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1177 a_5363_47# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1178 VGND D[9] a_1693_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1179 VGND D[14] a_7939_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1180 a_1430_325# S[1] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1181 a_2693_297# a_3135_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1182 VGND D[2] a_2695_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1183 a_6887_311# D[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1184 VPWR D[14] a_7937_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1185 a_9250_325# S[7] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1186 a_6887_613# D[13] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1187 VGND D[12] a_5363_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1188 a_5803_793# S[12] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1189 VGND D[14] a_7939_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1190 a_9513_918# D[15] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1191 Z S[4] a_5363_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1192 VGND S[0] a_559_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1193 VGND D[3] a_4269_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1194 a_5361_297# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1195 VGND D[10] a_2695_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1196 Z a_6674_599# a_6887_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1197 Z S[15] a_9513_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1198 VGND S[7] a_9250_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1199 a_1643_613# a_1430_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1200 a_5361_591# a_5803_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1201 a_5803_793# S[12] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1202 a_7939_47# S[6] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1203 a_5361_591# D[12] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1204 a_9463_613# a_9250_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1205 a_5363_47# S[4] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1206 a_7937_297# a_8379_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1207 Z a_559_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1208 VPWR D[0] a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1209 Z S[7] a_9513_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1210 a_6937_66# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1211 a_6674_599# S[13] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1212 Z S[6] a_7939_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1213 a_5363_47# S[4] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1214 Z S[10] a_2695_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1215 VGND S[10] a_3135_793# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1216 a_9513_66# D[7] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1217 VPWR D[5] a_6887_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1218 Z S[12] a_5363_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1219 a_119_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1220 Z S[5] a_6937_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1221 VPWR D[8] a_117_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1222 VGND S[2] a_3135_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1223 VGND S[15] a_9250_599# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1224 VPWR D[13] a_6887_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1225 VPWR S[9] a_1430_599# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1226 a_6937_918# S[13] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1227 a_7937_591# a_8379_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1228 Z S[5] a_6937_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1229 a_2693_591# a_3135_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1230 a_7939_911# S[14] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1231 Z a_5803_265# a_5361_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1232 VGND D[4] a_5363_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1233 VPWR S[15] a_9250_599# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1234 VGND S[3] a_4006_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1235 VGND D[8] a_119_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1236 a_119_911# S[8] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1237 a_4006_599# S[11] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1238 a_6887_613# a_6674_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1239 a_3135_265# S[2] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1240 a_119_911# D[8] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1241 VGND S[1] a_1430_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1242 Z S[13] a_6937_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1243 a_4219_311# a_4006_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1244 a_7939_47# S[6] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1245 a_4269_918# D[11] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1246 a_7937_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1247 VGND D[5] a_6937_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1248 Z a_8379_265# a_7937_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1249 a_117_297# a_559_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1250 Z a_3135_265# a_2693_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1251 a_7937_591# D[14] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1252 a_9513_918# S[15] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1253 Z S[7] a_9513_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1254 Z S[6] a_7939_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1255 a_6887_311# D[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1256 VPWR S[5] a_6674_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1257 a_5361_591# a_5803_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1258 VGND D[6] a_7939_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1259 Z S[9] a_1693_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1260 a_4219_613# a_4006_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1261 Z a_6674_325# a_6887_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1262 a_6937_66# D[5] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1263 Z S[10] a_2695_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1264 a_6887_613# D[13] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1265 VPWR D[4] a_5361_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1266 a_1430_599# S[9] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1267 a_5363_911# D[12] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1268 a_2695_911# S[10] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1269 a_117_591# a_559_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1270 Z a_3135_793# a_2693_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1271 VPWR D[1] a_1643_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1272 a_9513_66# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1273 Z a_1430_599# a_1643_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1274 a_6937_918# D[13] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1275 a_5363_47# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1276 a_1693_918# D[9] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1277 VPWR D[12] a_5361_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1278 VGND D[15] a_9513_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1279 a_9250_599# S[15] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1280 VPWR S[3] a_4006_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1281 VGND D[7] a_9513_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1282 a_7937_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1283 VGND S[12] a_5803_793# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1284 a_1643_311# a_1430_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1285 VPWR D[9] a_1643_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1286 Z a_9250_599# a_9463_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1287 Z a_4006_325# a_4219_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1288 a_1430_325# S[1] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1289 a_4219_311# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1290 Z S[13] a_6937_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1291 a_4006_325# S[3] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1292 a_6887_311# a_6674_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1293 a_7937_591# D[14] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1294 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1295 Z a_5803_265# a_5361_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1296 VGND D[11] a_4269_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1297 a_4219_613# D[11] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1298 VGND D[13] a_6937_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1299 Z a_559_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1300 VGND D[0] a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1301 VPWR D[2] a_2693_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1302 Z S[8] a_119_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1303 a_9463_613# a_9250_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1304 a_117_591# D[8] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1305 a_7939_911# D[14] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1306 Z S[2] a_2695_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1307 a_2695_911# D[10] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1308 VPWR S[2] a_3135_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1309 VPWR D[10] a_2693_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1310 VGND D[11] a_4269_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1311 a_4269_918# D[11] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1312 Z S[12] a_5363_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1313 Z a_4006_599# a_4219_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1314 Z a_8379_793# a_7937_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1315 a_1693_66# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1316 Z S[11] a_4269_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1317 a_119_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1318 a_4269_918# S[11] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1319 a_5361_297# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__ebufn_4 A Z TE_B VNB VPB VGND VPWR
-M1000 a_340_309# a_27_47# Z VPB phighvt w=1e+06u l=180000u
-+  ad=1.9263e+12p pd=1.369e+07u as=5.8e+11p ps=5.16e+06u
-M1001 Z a_27_47# a_413_47# VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=1.053e+12p ps=9.74e+06u
-M1002 a_413_47# a_224_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.2475e+11p ps=6.13e+06u
-M1003 a_413_47# a_27_47# Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Z a_27_47# a_340_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_340_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=9.402e+11p ps=7.71e+06u
-M1006 VGND a_224_47# a_413_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1008 VPWR TE_B a_340_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_224_47# TE_B VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
-M1010 Z a_27_47# a_413_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_340_309# a_27_47# Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_340_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Z a_27_47# a_340_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_413_47# a_224_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_224_47# a_413_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR TE_B a_340_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_224_47# TE_B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1018 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1019 a_413_47# a_27_47# Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__clkmux2_1 VGND VPWR S A1 A0 X VPB VNB
-M1000 a_245_47# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=4.76e+11p ps=4.08e+06u
-M1001 a_478_47# A0 a_79_21# VNB nshort w=420000u l=150000u
-+  ad=3.591e+11p pd=2.55e+06u as=2.121e+11p ps=1.85e+06u
-M1002 a_79_21# A1 a_245_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=8.058e+11p pd=5.56e+06u as=2.7e+11p ps=2.54e+06u
-M1004 a_599_309# A1 a_79_21# VPB phighvt w=940000u l=180000u
-+  ad=2.444e+11p pd=2.4e+06u as=9.447e+11p ps=3.89e+06u
-M1005 a_243_309# S VPWR VPB phighvt w=940000u l=180000u
-+  ad=3.901e+11p pd=2.71e+06u as=0p ps=0u
-M1006 a_649_21# S VPWR VPB phighvt w=940000u l=180000u
-+  ad=2.726e+11p pd=2.46e+06u as=0p ps=0u
-M1007 a_649_21# S VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1008 VGND a_649_21# a_478_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_79_21# A0 a_243_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_649_21# a_599_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_79_21# X VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-.ends
-.subckt sky130_fd_sc_hdll__o21ai_1 VGND VPWR A2 A1 B1 Y VPB VNB
-M1000 VPWR B1 Y VPB phighvt w=700000u l=180000u
-+  ad=6.515e+11p pd=5.03e+06u as=3.72e+11p ps=2.84e+06u
-M1001 Y A2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.3e+11p ps=2.46e+06u
-M1002 a_117_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=3.8025e+11p pd=2.47e+06u as=3.77e+11p ps=3.76e+06u
-M1004 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.535e+11p ps=2.08e+06u
-M1005 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a222oi_1 VNB VPB VGND VPWR C2 C1 B1 A2 A1 Y B2
-M1000 a_357_297# B1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.3e+11p pd=7.66e+06u as=5.8e+11p ps=5.16e+06u
-M1001 Y C2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=0p ps=0u
-M1002 VGND C2 a_119_47# VNB nshort w=640000u l=150000u
-+  ad=9.28e+11p pd=5.46e+06u as=1.344e+11p ps=1.7e+06u
-M1003 Y B1 a_449_47# VNB nshort w=640000u l=150000u
-+  ad=4.416e+11p pd=3.94e+06u as=1.344e+11p ps=1.7e+06u
-M1004 a_117_297# B2 a_357_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_627_47# A1 Y VNB nshort w=640000u l=150000u
-+  ad=2.432e+11p pd=2.04e+06u as=0p ps=0u
-M1006 a_117_297# C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_357_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.5e+11p ps=2.7e+06u
-M1008 VGND A2 a_627_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_357_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_449_47# B2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_119_47# C1 Y VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__diode_6 VNB VPB VGND VPWR DIODE
-D0 VNB DIODE ndiode p=1.47e+07u a=2.2032e+12p
-.ends
-.subckt sky130_fd_sc_hdll__clkinv_16 Y A VGND VPWR VNB VPB
-M1000 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=1.1739e+12p pd=1.231e+07u as=1.2285e+12p ps=1.341e+07u
-M1001 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=3.895e+12p pd=3.379e+07u as=3.755e+12p ps=3.151e+07u
-M1002 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  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=1e+06u l=180000u
-+  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 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  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 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND A Y 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=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  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 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a21o_2 X B1 A1 A2 VNB VPB VGND VPWR
-M1000 a_444_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.7e+11p pd=5.14e+06u as=9.35e+11p ps=7.87e+06u
-M1001 VPWR A1 a_444_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 X a_80_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.5e+11p pd=2.7e+06u as=0p ps=0u
-M1003 X a_80_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.795e+11p pd=2.16e+06u as=8.5475e+11p ps=6.53e+06u
-M1004 a_444_297# B1 a_80_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.25e+11p ps=2.65e+06u
-M1005 VPWR a_80_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_80_21# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=3.185e+11p pd=2.28e+06u as=0p ps=0u
-M1007 VGND a_80_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_532_47# A1 a_80_21# VNB nshort w=650000u l=150000u
-+  ad=2.3725e+11p pd=2.03e+06u as=0p ps=0u
-M1009 VGND A2 a_532_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a211o_2 X A2 A1 B1 C1 VNB VPB VGND VPWR
-M1000 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=9.4e+11p pd=7.88e+06u as=2.9e+11p ps=2.58e+06u
-M1001 a_643_297# B1 a_319_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.3e+11p pd=2.46e+06u as=6.8e+11p ps=5.36e+06u
-M1002 VGND B1 a_79_21# VNB nshort w=650000u l=150000u
-+  ad=1.027e+12p pd=7.06e+06u as=4.5825e+11p ps=4.01e+06u
-M1003 a_421_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.5925e+11p pd=1.79e+06u as=0p ps=0u
-M1004 a_319_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_79_21# C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A2 a_319_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.145e+11p ps=1.96e+06u
-M1009 a_79_21# C1 a_643_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1010 a_79_21# A1 a_421_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor4bb_1 A C_N D_N B Y VNB VPB VGND VPWR
-M1000 VGND C_N a_27_410# VNB nshort w=420000u l=150000u
-+  ad=7.674e+11p pd=7.31e+06u as=1.302e+11p ps=1.46e+06u
-M1001 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=3.9e+11p pd=3.8e+06u as=0p ps=0u
-M1002 a_216_93# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.281e+11p pd=1.45e+06u as=0p ps=0u
-M1003 Y a_216_93# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_422_297# a_216_93# Y VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=2.7e+11p ps=2.54e+06u
-M1006 VGND a_27_410# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_622_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.23625e+11p pd=5.22e+06u as=2.9e+11p ps=2.58e+06u
-M1008 VPWR C_N a_27_410# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1009 a_216_93# D_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1010 a_622_297# B a_518_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.4e+11p ps=2.68e+06u
-M1011 a_518_297# a_27_410# a_422_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__isobufsrc_1 A X SLEEP VPB VNB VGND VPWR
-M1000 VGND a_74_47# X VNB nshort w=650000u l=150000u
-+  ad=4.23e+11p pd=3.99e+06u as=2.08e+11p ps=1.94e+06u
-M1001 a_283_297# SLEEP VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.3e+11p pd=2.46e+06u as=3.288e+11p ps=2.82e+06u
-M1002 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_74_47# a_283_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1004 VGND A a_74_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1005 VPWR A a_74_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-.ends
-.subckt sky130_fd_sc_hdll__or4_4 B C A D X VNB VPB VPWR VGND
-M1000 X a_32_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=9.7e+11p ps=7.94e+06u
-M1001 a_332_297# B a_238_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=2.9e+11p ps=2.58e+06u
-M1002 X a_32_297# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=1.07575e+12p ps=9.81e+06u
-M1003 VGND A a_32_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.55e+11p ps=4e+06u
-M1004 VGND a_32_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_32_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C a_32_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_32_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_238_297# C a_122_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=4e+11p ps=2.8e+06u
-M1009 VPWR a_32_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A a_332_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_32_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_32_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_32_297# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_122_297# D a_32_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1015 VPWR a_32_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor4_6 A C D B Y VPB VNB VGND VPWR
-M1000 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=2.01e+12p ps=1.802e+07u
-M1001 a_1263_297# C a_685_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.02e+12p pd=1.804e+07u as=1.74e+12p ps=1.548e+07u
-M1002 Y D a_1263_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=0p ps=0u
-M1003 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=3.419e+12p pd=2.742e+07u as=2.106e+12p ps=2.208e+07u
-M1004 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_685_297# C a_1263_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# B a_685_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_685_297# C a_1263_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1263_297# C a_685_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_685_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1263_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_297# B a_685_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1263_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y D a_1263_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y D a_1263_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_27_297# B a_685_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_685_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1263_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_685_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_685_297# C a_1263_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_1263_297# C a_685_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and4bb_4 C A_N D X B_N VNB VPB VGND VPWR
-M1000 a_606_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=2.6975e+11p pd=2.13e+06u as=8.552e+11p ps=7.75e+06u
-M1001 a_912_21# A_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=1.9814e+12p ps=1.503e+07u
-M1002 VPWR B_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1003 a_184_21# a_912_21# a_836_47# VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=2.47e+11p ps=2.06e+06u
-M1004 a_184_21# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=7.35e+11p pd=5.47e+06u as=0p ps=0u
-M1005 VGND a_184_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1006 VPWR C a_184_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_184_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_184_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1009 a_836_47# a_27_47# a_719_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.8275e+11p ps=2.17e+06u
-M1010 X a_184_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_184_21# D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_912_21# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1013 VPWR a_184_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1015 VGND a_184_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_184_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_719_47# C a_606_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_912_21# a_184_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_184_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__einvp_2 A Z TE VGND VPWR VPB VNB
-M1000 Z A a_214_47# VNB nshort w=650000u l=150000u
-+  ad=2.405e+11p pd=2.04e+06u as=6.0775e+11p ps=5.77e+06u
-M1001 VPWR a_27_47# a_235_309# VPB phighvt w=940000u l=180000u
-+  ad=4.454e+11p pd=4.28e+06u as=9.587e+11p ps=7.84e+06u
-M1002 VPWR TE a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1003 a_235_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1004 VGND TE a_214_47# VNB nshort w=650000u l=150000u
-+  ad=4.1e+11p pd=3.95e+06u as=0p ps=0u
-M1005 a_214_47# TE VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_214_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Z A a_235_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND TE a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1009 a_235_309# a_27_47# VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a221oi_1 Y C1 A1 A2 B2 B1 VGND VPWR VPB VNB
-M1000 a_211_297# B2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=6.4e+11p pd=5.28e+06u as=5.6e+11p ps=5.12e+06u
-M1001 VPWR A2 a_211_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1002 a_225_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.365e+11p pd=1.72e+06u as=4.3225e+11p ps=3.93e+06u
-M1003 Y B1 a_225_47# VNB nshort w=650000u l=150000u
-+  ad=6.045e+11p pd=5.76e+06u as=0p ps=0u
-M1004 VGND A2 a_505_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.47e+11p ps=2.06e+06u
-M1005 a_505_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_117_297# C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1007 a_211_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_117_297# B1 a_211_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__buf_8 A X VGND VPWR VPB VNB
-M1000 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=1.72e+12p ps=1.544e+07u
-M1001 a_27_47# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1002 a_27_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=4.095e+11p pd=3.86e+06u as=1.1765e+12p ps=1.142e+07u
-M1003 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=8.645e+11p pd=7.86e+06u as=0p ps=0u
-M1005 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__inv_8 A Y VNB VPB VGND VPWR
-M1000 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=8.645e+11p pd=7.86e+06u as=9.62e+11p ps=9.46e+06u
-M1001 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=1.41e+12p ps=1.282e+07u
-M1002 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o22a_1 A2 X B1 A1 B2 VPB VNB VGND VPWR
-M1000 VGND A2 a_219_47# VNB nshort w=650000u l=150000u
-+  ad=3.835e+11p pd=3.78e+06u as=6.565e+11p ps=5.92e+06u
-M1001 VPWR a_83_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=9.8e+11p pd=5.96e+06u as=2.9e+11p ps=2.58e+06u
-M1002 VPWR A1 a_511_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3e+11p ps=2.6e+06u
-M1003 a_83_21# B2 a_299_297# VPB phighvt w=1e+06u l=180000u
-+  ad=4.1e+11p pd=2.82e+06u as=2.9e+11p ps=2.58e+06u
-M1004 a_219_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_299_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_83_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.82e+11p ps=1.86e+06u
-M1007 a_511_297# A2 a_83_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_83_21# B1 a_219_47# VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=0p ps=0u
-M1009 a_219_47# B2 a_83_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__inputiso0p_1 X SLEEP A VGND VPWR VPB VNB
-M1000 VGND A a_307_47# VNB nshort w=420000u l=150000u
-+  ad=4.197e+11p pd=3.81e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR SLEEP a_27_413# VPB phighvt w=420000u l=180000u
-+  ad=6.233e+11p pd=5.09e+06u as=1.134e+11p ps=1.38e+06u
-M1002 VPWR A a_211_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1003 X a_211_413# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1004 X a_211_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1005 a_27_413# SLEEP VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1006 a_211_413# a_27_413# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_307_47# a_27_413# a_211_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-.ends
-.subckt sky130_fd_sc_hdll__nand3b_4 A_N Y B C VNB VPB VGND VPWR
-M1000 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.74e+12p pd=1.548e+07u as=2.61e+12p ps=2.322e+07u
-M1001 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_225_47# B a_683_47# VNB nshort w=650000u l=150000u
-+  ad=9.62e+11p pd=9.46e+06u as=8.645e+11p ps=7.86e+06u
-M1004 a_683_47# B a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_225_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1006 Y a_27_47# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A_N a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1008 a_225_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND C a_683_47# VNB nshort w=650000u l=150000u
-+  ad=8.45e+11p pd=7.8e+06u as=0p ps=0u
-M1012 a_683_47# C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_225_47# B a_683_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y a_27_47# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND C a_683_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_683_47# C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1024 a_683_47# B a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor3_1 C Y A B VPB VNB VGND VPWR
-M1000 a_211_297# B a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=2.9e+11p ps=2.58e+06u
-M1001 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=6.305e+11p ps=4.54e+06u
-M1002 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_117_297# C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1004 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A a_211_297# VPB phighvt w=1e+06u l=180000u
-+  ad=6.1e+11p pd=3.22e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand4bb_2 D C B_N A_N Y VNB VPB VGND VPWR
-M1000 a_211_413# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.974e+11p pd=1.78e+06u as=3.424e+11p ps=3.42e+06u
-M1001 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=2.0218e+12p ps=1.522e+07u
-M1002 VPWR B_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1003 a_361_47# a_211_413# Y VNB nshort w=650000u l=150000u
-+  ad=5.785e+11p pd=5.68e+06u as=2.08e+11p ps=1.94e+06u
-M1004 Y a_211_413# a_361_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_841_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=5.59e+11p pd=5.62e+06u as=0p ps=0u
-M1007 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND D a_841_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_211_413# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_841_47# C a_641_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1012 VGND B_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1013 a_211_413# A_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=2.016e+11p pd=1.8e+06u as=0p ps=0u
-M1014 Y a_211_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_361_47# a_27_47# a_641_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_641_47# a_27_47# a_361_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_641_47# C a_841_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__muxb16to1_2 Z VGND VPWR VNB VPB D[2] D[1] S[7] S[6] S[5]
-+ D[9] D[8] S[14] S[13] S[12] S[11] S[10] S[9] S[8] D[15] D[14] D[13] D[12] D[11]
-+ D[10] S[15] S[4] S[3] S[2] S[1] S[0] D[7] D[6] D[5] D[4] D[3] D[0]
-M1000 a_2603_911# S[12] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=2.2464e+12p ps=2.528e+07u
-M1001 VPWR S[4] a_2854_265# VPB phighvt w=1e+06u l=180000u
-+  ad=7.52e+12p pd=6.304e+07u as=2.7e+11p ps=2.54e+06u
-M1002 VPWR D[3] a_2112_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1003 VPWR D[2] a_1315_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1004 Z a_1989_47# a_2112_333# VPB phighvt w=820000u l=180000u
-+  ad=3.8048e+12p pd=3.552e+07u as=0p ps=0u
-M1005 Z a_1566_265# a_1315_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Z a_4142_793# a_3891_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1007 VPWR S[12] a_2854_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1008 VPWR D[11] a_2112_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1009 VPWR D[10] a_1315_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1010 a_27_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1011 a_2133_915# D[11] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=3.9312e+12p ps=4.208e+07u
-M1012 VGND S[14] a_4142_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1013 a_27_297# a_278_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_591# D[8] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1015 Z S[10] a_1315_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1016 a_3421_915# S[13] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1017 a_4565_47# S[7] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1018 VGND D[14] a_3891_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1019 a_1989_47# S[3] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1020 a_27_911# S[8] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1021 a_3891_911# S[14] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Z S[5] a_3421_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1023 VPWR S[0] a_278_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1024 a_4709_69# D[7] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1025 a_2133_69# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1026 VGND D[9] a_845_915# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1027 VPWR S[8] a_278_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1028 a_845_69# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1029 Z S[11] a_2133_915# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_2603_297# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1031 Z a_278_265# a_27_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_27_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1033 VGND S[10] a_1566_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1034 a_2603_297# a_2854_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1315_911# D[10] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Z a_701_937# a_824_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1037 Z S[1] a_845_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_2603_591# D[12] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1039 a_701_937# S[9] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1040 a_4565_937# S[15] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1041 Z S[0] a_27_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_27_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_1315_911# S[10] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_1315_591# a_1566_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_2112_591# a_1989_937# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 Z S[4] a_2603_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1047 VGND D[8] a_27_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 Z S[9] a_845_915# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 a_4688_591# a_4565_937# Z VPB phighvt w=820000u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1050 VGND D[7] a_4709_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 a_3400_333# D[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1052 a_824_333# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1053 a_1989_47# S[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1054 a_3421_69# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 a_3400_333# a_3277_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 a_824_591# D[9] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 VGND D[4] a_2603_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 a_3400_591# D[13] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1059 a_845_915# D[9] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 a_1989_937# S[11] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1061 a_4688_333# D[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1062 a_3891_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1063 VGND S[12] a_2854_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1064 VGND S[4] a_2854_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1065 a_3277_47# S[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1066 a_3891_297# a_4142_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1067 a_2133_915# S[11] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1068 a_4688_591# D[15] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 a_3891_591# D[14] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 a_3277_937# S[13] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1071 a_1989_937# S[11] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1072 a_701_47# S[1] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1073 VGND D[12] a_2603_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1074 VGND D[1] a_845_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1075 VPWR D[0] a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1076 Z a_4565_937# a_4688_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 VPWR S[6] a_4142_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1078 VPWR D[8] a_27_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1079 VPWR D[5] a_3400_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1080 VPWR D[4] a_2603_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1081 VGND S[0] a_278_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1082 Z a_3277_47# a_3400_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1083 Z a_2854_265# a_2603_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1084 a_824_333# a_701_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1085 VPWR S[14] a_4142_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1086 a_2603_47# S[4] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1087 VPWR D[13] a_3400_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1088 VPWR D[12] a_2603_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1089 a_701_47# S[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1090 VGND D[5] a_3421_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1091 Z a_4142_265# a_3891_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1092 a_701_937# S[9] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1093 Z a_1989_937# a_2112_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1094 a_2603_47# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1095 Z a_1566_793# a_1315_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1096 a_3277_937# S[13] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1097 VPWR D[1] a_824_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1098 a_3277_47# S[5] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1099 a_27_591# a_278_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1100 VGND D[13] a_3421_915# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1101 VPWR D[9] a_824_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1102 Z S[3] a_2133_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1103 a_2603_911# D[12] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1104 Z S[8] a_27_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1105 a_845_69# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1106 Z S[15] a_4709_915# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1107 Z S[7] a_4709_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1108 VGND D[0] a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1109 VGND D[10] a_1315_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1110 a_3421_69# D[5] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1111 Z a_278_793# a_27_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1112 Z S[6] a_3891_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1113 Z a_701_47# a_824_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1114 a_2603_591# a_2854_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1115 VGND S[8] a_278_793# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1116 Z S[2] a_1315_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1117 a_1315_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1118 a_27_911# D[8] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1119 a_3891_911# D[14] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1120 a_1315_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1121 a_3421_915# D[13] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1122 a_4688_333# a_4565_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1123 a_2112_333# a_1989_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1124 a_1315_297# a_1566_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1125 a_2133_69# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1126 a_1315_591# D[10] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1127 VGND D[2] a_1315_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1128 Z S[12] a_2603_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1129 a_4565_47# S[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1130 a_845_915# S[9] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1131 a_4709_915# S[15] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1132 a_4565_937# S[15] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1133 VPWR S[2] a_1566_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1134 a_3400_591# a_3277_937# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1135 a_2112_333# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1136 VGND D[11] a_2133_915# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1137 VPWR S[10] a_1566_793# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1138 a_4709_69# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1139 VGND D[6] a_3891_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1140 a_3891_591# a_4142_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1141 a_2112_591# D[11] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1142 VPWR D[7] a_4688_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1143 VPWR D[6] a_3891_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1144 VGND S[6] a_4142_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1145 a_3891_47# S[6] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1146 Z S[13] a_3421_915# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1147 a_4709_915# D[15] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1148 Z a_4565_47# a_4688_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1149 VPWR D[15] a_4688_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1150 VGND S[2] a_1566_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1151 a_1315_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1152 VPWR D[14] a_3891_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1153 Z S[14] a_3891_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1154 VGND D[15] a_4709_915# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1155 a_3891_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1156 VGND D[3] a_2133_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1157 a_824_591# a_701_937# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1158 Z a_3277_937# a_3400_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1159 Z a_2854_793# a_2603_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__ebufn_2 Z A TE_B VNB VPB VGND VPWR
-M1000 VPWR A a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=5.254e+11p pd=4.53e+06u as=1.728e+11p ps=1.82e+06u
-M1001 VGND a_224_47# a_412_47# VNB nshort w=650000u l=150000u
-+  ad=3.54e+11p pd=3.53e+06u as=6.8575e+11p ps=6.01e+06u
-M1002 a_224_47# TE_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1003 a_340_309# a_27_47# Z VPB phighvt w=1e+06u l=180000u
-+  ad=1.3537e+12p pd=8.63e+06u as=2.9e+11p ps=2.58e+06u
-M1004 a_412_47# a_224_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_412_47# a_27_47# Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.405e+11p ps=2.04e+06u
-M1006 a_224_47# TE_B VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1007 a_340_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR TE_B a_340_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Z a_27_47# a_340_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1011 Z a_27_47# a_412_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__diode_4 DIODE VGND VPWR VPB VNB
-D0 VNB DIODE ndiode p=9.88e+06u a=1.0557e+12p
-.ends
-.subckt sky130_fd_sc_hdll__and3_1 VGND VPWR X B A C VPB VNB
-M1000 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=4.548e+11p ps=4.26e+06u
-M1001 a_213_47# B a_119_47# VNB nshort w=420000u l=150000u
-+  ad=2.247e+11p pd=1.91e+06u as=1.344e+11p ps=1.48e+06u
-M1002 VPWR A a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=3.255e+11p ps=3.23e+06u
-M1003 VGND C a_213_47# VNB nshort w=420000u l=150000u
-+  ad=2.58e+11p pd=2.2e+06u as=0p ps=0u
-M1004 VPWR C a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1006 a_119_47# A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1007 a_27_47# B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__clkbuf_1 VGND VPWR X A VPB VNB w_233_n17#
-M1000 VPWR a_75_212# X VPB phighvt w=790000u l=180000u
-+  ad=5.293e+11p pd=2.92e+06u as=2.133e+11p ps=2.12e+06u
-M1001 a_75_212# A VGND w_233_n17# nshort w=520000u l=150000u
-+  ad=1.404e+11p pd=1.58e+06u as=3.38e+11p ps=2.34e+06u
-M1002 a_75_212# A VPWR VPB phighvt w=790000u l=180000u
-+  ad=2.133e+11p pd=2.12e+06u as=0p ps=0u
-M1003 VGND a_75_212# X w_233_n17# nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.612e+11p ps=1.66e+06u
-.ends
-.subckt sky130_fd_sc_hdll__clkinv_1 Y A VPB VNB VGND VPWR
-M1000 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.323e+11p ps=1.47e+06u
-M1001 Y A VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.436e+11p pd=2.26e+06u as=4.704e+11p ps=4.48e+06u
-M1002 VPWR A Y VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sdfstp_1 SCE SET_B VPWR VGND CLK D SCD Q VPB VNB
-M1000 VPWR SET_B a_1229_21# VPB phighvt w=420000u l=180000u
-+  ad=1.5997e+12p pd=1.544e+07u as=1.722e+11p ps=1.66e+06u
-M1001 VGND a_349_21# a_295_47# VNB nshort w=420000u l=150000u
-+  ad=1.2848e+12p pd=1.309e+07u as=1.134e+11p ps=1.38e+06u
-M1002 Q a_2381_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1003 a_1955_47# a_693_369# a_1725_329# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.482e+11p ps=2.2e+06u
-M1004 VPWR a_1725_329# a_2381_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1005 VGND SCE a_349_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1006 a_1075_413# a_877_369# a_201_47# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.99e+11p ps=3.24e+06u
-M1007 a_1725_329# a_877_369# a_1645_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=5.056e+11p ps=2.86e+06u
-M1008 VPWR SCD a_27_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=3.456e+11p ps=3.64e+06u
-M1009 a_1229_21# a_1075_413# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1841_413# a_877_369# a_1725_329# VPB phighvt w=420000u l=180000u
-+  ad=1.722e+11p pd=1.66e+06u as=3.906e+11p ps=3.86e+06u
-M1011 a_1725_329# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR SCE a_349_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1013 a_1725_329# a_693_369# a_1643_329# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=1.932e+11p ps=2.14e+06u
-M1014 a_1921_295# a_1725_329# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1015 a_877_369# a_693_369# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1016 VGND a_1229_21# a_1177_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1017 VGND CLK a_693_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1018 a_1645_47# a_1075_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_1921_295# a_1841_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1467_47# a_1075_413# a_1229_21# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.512e+11p ps=1.56e+06u
-M1021 a_27_369# a_349_21# a_201_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_119_47# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1023 a_1177_47# a_877_369# a_1075_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1024 VGND SET_B a_1467_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_877_369# a_693_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1026 a_1075_413# a_693_369# a_201_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1027 a_2027_47# a_1921_295# a_1955_47# VNB nshort w=420000u l=150000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1028 a_1643_329# a_1075_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_295_47# D a_201_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_201_47# SCE a_119_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND SET_B a_2027_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND a_1725_329# a_2381_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1033 a_211_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.472e+11p pd=1.74e+06u as=0p ps=0u
-M1034 a_1921_295# a_1725_329# VGND VNB nshort w=420000u l=150000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1035 Q a_2381_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1036 a_201_47# D a_211_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1169_413# a_693_369# a_1075_413# VPB phighvt w=420000u l=180000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1038 VPWR a_1229_21# a_1169_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR CLK a_693_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-.ends
-.subckt sky130_fd_sc_hdll__dfstp_4 Q D VPWR CLK VGND VPB VNB SET_B
-M1000 VPWR SET_B a_1126_413# VPB phighvt w=420000u l=180000u
-+  ad=1.9683e+12p pd=1.875e+07u as=2.856e+11p ps=3.04e+06u
-M1001 Q a_1738_47# VGND VNB nshort w=650000u l=150000u
-+  ad=5.85e+11p pd=5.7e+06u as=1.5993e+12p ps=1.487e+07u
-M1002 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1003 a_506_47# a_27_47# a_409_329# VNB nshort w=360000u l=150000u
-+  ad=1.8e+11p pd=1.72e+06u as=1.87e+11p ps=1.93e+06u
-M1004 Q a_1738_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.5e+11p pd=7.7e+06u as=0p ps=0u
-M1005 a_1344_47# a_27_47# a_1126_413# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.596e+11p ps=1.6e+06u
-M1006 VGND a_1126_413# a_1738_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1007 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1008 VPWR a_1738_47# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_1126_413# a_1738_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1010 VPWR a_702_21# a_610_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.974e+11p ps=1.78e+06u
-M1011 VPWR a_1288_261# a_1244_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=9.66e+10p ps=1.3e+06u
-M1012 a_1126_413# a_211_363# a_1156_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1013 a_1044_413# a_506_47# VPWR VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=0p ps=0u
-M1014 Q a_1738_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_1738_47# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Q a_1738_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_409_329# D VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Q a_1738_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_409_329# D VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.625e+11p pd=2.39e+06u as=0p ps=0u
-M1020 a_1156_47# a_506_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_636_47# a_211_363# a_506_47# VNB nshort w=360000u l=150000u
-+  ad=1.341e+11p pd=1.5e+06u as=0p ps=0u
-M1022 VPWR a_506_47# a_702_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1023 a_1288_261# a_1126_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1024 a_610_413# a_27_47# a_506_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1025 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1026 a_866_47# SET_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1027 VGND a_702_21# a_636_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1288_261# a_1126_413# VGND VNB nshort w=540000u l=150000u
-+  ad=1.404e+11p pd=1.6e+06u as=0p ps=0u
-M1029 a_1244_413# a_211_363# a_1126_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_702_21# a_506_47# a_866_47# VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1031 a_702_21# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1033 a_506_47# a_211_363# a_409_329# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1416_47# a_1288_261# a_1344_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1035 a_1126_413# a_27_47# a_1044_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR a_1738_47# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND SET_B a_1416_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Q a_1738_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND a_1738_47# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or4_2 B C A X D VPWR VGND VPB VNB
-M1000 a_27_297# D VGND VNB nshort w=420000u l=150000u
-+  ad=2.94e+11p pd=3.08e+06u as=6.666e+11p ps=6.83e+06u
-M1001 VGND A a_27_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 X a_27_297# VGND VNB nshort w=650000u l=150000u
-+  ad=3.4775e+11p pd=2.37e+06u as=0p ps=0u
-M1003 a_117_297# D a_27_297# VPB phighvt w=420000u l=180000u
-+  ad=1.47e+11p pd=1.54e+06u as=1.134e+11p ps=1.38e+06u
-M1004 VPWR A a_305_297# VPB phighvt w=420000u l=180000u
-+  ad=6.257e+11p pd=5.35e+06u as=1.47e+11p ps=1.54e+06u
-M1005 a_27_297# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C a_27_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_27_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=4.55e+11p ps=2.91e+06u
-M1008 VGND a_27_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_27_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_223_297# C a_117_297# VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=0p ps=0u
-M1011 a_305_297# B a_223_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sdfsbp_2 Q_N Q CLK D SCD SCE SET_B VGND VPWR VPB VNB
-M1000 VGND a_349_21# a_295_47# VNB nshort w=420000u l=150000u
-+  ad=1.90535e+12p pd=1.891e+07u as=1.134e+11p ps=1.38e+06u
-M1001 a_1930_295# a_1735_329# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1002 a_1930_295# a_1735_329# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=2.6255e+12p ps=2.377e+07u
-M1003 a_1075_413# a_877_369# a_199_47# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.99e+11p ps=3.24e+06u
-M1004 VGND SCE a_349_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1005 a_1735_329# a_877_369# a_1655_47# VNB nshort w=640000u l=150000u
-+  ad=3.054e+11p pd=2.42e+06u as=4.736e+11p ps=2.76e+06u
-M1006 Q a_2739_47# VGND VNB nshort w=650000u l=150000u
-+  ad=2.08e+11p pd=1.94e+06u as=0p ps=0u
-M1007 VPWR SCD a_27_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=3.456e+11p ps=3.64e+06u
-M1008 a_1219_21# a_1075_413# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.701e+11p pd=1.65e+06u as=0p ps=0u
-M1009 a_1870_413# a_877_369# a_1735_329# VPB phighvt w=420000u l=180000u
-+  ad=1.302e+11p pd=1.46e+06u as=4.305e+11p ps=4.05e+06u
-M1010 a_1655_47# a_1075_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR SCE a_349_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1012 a_1735_329# a_693_369# a_1652_329# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=1.974e+11p ps=2.15e+06u
-M1013 a_1735_329# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_2739_47# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1015 VGND a_1735_329# Q_N VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1016 VPWR a_1735_329# a_2739_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1017 VGND CLK a_693_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1018 a_877_369# a_693_369# VGND VNB nshort w=420000u l=150000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1019 VPWR a_1735_329# Q_N VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1020 VPWR a_1930_295# a_1870_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1467_47# a_1075_413# a_1219_21# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.512e+11p ps=1.56e+06u
-M1022 a_27_369# a_349_21# a_199_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR SET_B a_1219_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1177_47# a_877_369# a_1075_413# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.344e+11p ps=1.48e+06u
-M1025 VGND SET_B a_1467_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Q a_2739_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_877_369# a_693_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1028 a_199_47# SCE a_109_47# VNB nshort w=420000u l=150000u
-+  ad=2.688e+11p pd=2.96e+06u as=1.26e+11p ps=1.44e+06u
-M1029 VGND a_1219_21# a_1177_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Q_N a_1735_329# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1075_413# a_693_369# a_199_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_295_47# D a_199_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND a_1735_329# a_2739_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1034 VGND a_2739_47# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1652_329# a_1075_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_211_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.472e+11p pd=1.74e+06u as=0p ps=0u
-M1037 Q_N a_1735_329# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_109_47# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_2049_47# a_1930_295# a_1977_47# VNB nshort w=420000u l=150000u
-+  ad=2.688e+11p pd=2.12e+06u as=8.82e+10p ps=1.26e+06u
-M1040 a_199_47# D a_211_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_1169_413# a_693_369# a_1075_413# VPB phighvt w=420000u l=180000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1042 VPWR a_1219_21# a_1169_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND SET_B a_2049_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VPWR CLK a_693_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1045 a_1977_47# a_693_369# a_1735_329# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a21boi_1 Y A1 B1_N A2 VPWR VGND VPB VNB
-M1000 VPWR B1_N a_27_413# VPB phighvt w=420000u l=180000u
-+  ad=5.355e+11p pd=4.23e+06u as=1.155e+11p ps=1.39e+06u
-M1001 VPWR A1 a_338_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.75e+11p ps=5.15e+06u
-M1002 VGND B1_N a_27_413# VNB nshort w=420000u l=150000u
-+  ad=4.345e+11p pd=3.99e+06u as=1.533e+11p ps=1.57e+06u
-M1003 a_434_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=2.665e+11p pd=2.12e+06u as=3.51e+11p ps=2.38e+06u
-M1004 VGND A2 a_434_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y a_27_413# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_338_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_338_297# a_27_413# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.25e+11p ps=2.65e+06u
-.ends
-.subckt sky130_fd_sc_hdll__and4bb_2 VNB VPB VGND VPWR A_N C B_N X D
-M1000 a_503_47# a_27_47# a_184_21# VNB nshort w=420000u l=150000u
-+  ad=1.449e+11p pd=1.53e+06u as=1.092e+11p ps=1.36e+06u
-M1001 VPWR D a_184_21# VPB phighvt w=420000u l=180000u
-+  ad=1.299e+12p pd=9.38e+06u as=2.562e+11p ps=2.9e+06u
-M1002 VPWR A_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1003 a_184_21# C VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_602_47# a_545_280# a_503_47# VNB nshort w=420000u l=150000u
-+  ad=1.407e+11p pd=1.51e+06u as=0p ps=0u
-M1005 VGND D a_699_47# VNB nshort w=420000u l=150000u
-+  ad=6.1255e+11p pd=5.76e+06u as=1.134e+11p ps=1.38e+06u
-M1006 a_699_47# C a_602_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_545_280# B_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1008 a_184_21# a_27_47# VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_545_280# a_184_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_184_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1011 VGND A_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1012 VGND a_184_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1013 X a_184_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_545_280# B_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1015 X a_184_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand3_1 Y A C B VPB VNB VGND VPWR
-M1000 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=6.2e+11p pd=5.24e+06u as=5.6e+11p ps=5.12e+06u
-M1001 a_203_47# B a_119_47# VNB nshort w=650000u l=150000u
-+  ad=2.47e+11p pd=2.06e+06u as=1.755e+11p ps=1.84e+06u
-M1002 Y A a_203_47# VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
-M1003 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_119_47# C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-.ends
-.subckt sky130_fd_sc_hdll__nor4_4 A C Y D B VPB VNB VGND VPWR
-M1000 a_497_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=1.43e+12p ps=1.286e+07u
-M1001 a_887_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.41e+12p pd=1.282e+07u as=5.8e+11p ps=5.16e+06u
-M1002 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1003 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=2.0475e+12p pd=1.8e+07u as=1.794e+12p ps=1.592e+07u
-M1004 a_497_297# C a_887_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y D a_887_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_887_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_887_297# C a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_297# B a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_497_297# C a_887_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_497_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_887_297# C a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_297# B a_497_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y D a_887_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__mux2_1 VGND VPWR S A1 A0 X VPB VNB
-M1000 a_245_47# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=4.745e+11p ps=4.06e+06u
-M1001 VGND a_657_21# a_499_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.318e+11p ps=2.42e+06u
-M1002 a_79_21# A0 a_243_374# VPB phighvt w=420000u l=180000u
-+  ad=4.515e+11p pd=2.99e+06u as=1.743e+11p ps=1.67e+06u
-M1003 a_613_374# A1 a_79_21# VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=0p ps=0u
-M1004 a_79_21# A1 a_245_47# VNB nshort w=420000u l=150000u
-+  ad=2.562e+11p pd=2.06e+06u as=0p ps=0u
-M1005 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=4.926e+11p pd=4.44e+06u as=2.7e+11p ps=2.54e+06u
-M1006 VPWR a_657_21# a_613_374# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_499_47# A0 a_79_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_657_21# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1009 a_243_374# S VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1011 a_657_21# S VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and2b_1 X A_N B VGND VPWR VPB VNB
-M1000 VPWR A_N a_27_413# VPB phighvt w=420000u l=180000u
-+  ad=6.422e+11p pd=5.18e+06u as=1.134e+11p ps=1.38e+06u
-M1001 VGND B a_327_47# VNB nshort w=420000u l=150000u
-+  ad=3.653e+11p pd=3.54e+06u as=1.218e+11p ps=1.42e+06u
-M1002 a_225_413# a_27_413# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1003 a_327_47# a_27_413# a_225_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1004 X a_225_413# VGND VNB nshort w=650000u l=150000u
-+  ad=1.95e+11p pd=1.9e+06u as=0p ps=0u
-M1005 X a_225_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.1e+11p pd=2.62e+06u as=0p ps=0u
-M1006 a_27_413# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1007 VPWR B a_225_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__buf_6 VPWR VGND X A VPB VNB
-M1000 VGND a_169_297# X VNB nshort w=650000u l=150000u
-+  ad=9.62e+11p pd=9.46e+06u as=6.565e+11p ps=5.92e+06u
-M1001 VPWR A a_169_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.41e+12p pd=1.282e+07u as=2.9e+11p ps=2.58e+06u
-M1002 a_169_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_169_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.7e+11p ps=7.74e+06u
-M1004 X a_169_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_169_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_169_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A a_169_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1008 VPWR a_169_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_169_297# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_169_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_169_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_169_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_169_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_169_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_169_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__inv_16 Y A VPB VNB VGND VPWR
-M1000 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=2.57e+12p pd=2.314e+07u as=2.32e+12p ps=2.064e+07u
-M1001 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=1.664e+12p pd=1.552e+07u as=1.8265e+12p ps=1.732e+07u
-M1005 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__inv_6 Y A VPB VNB VPWR VGND
-M1000 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.13e+12p pd=1.026e+07u as=8.7e+11p ps=7.74e+06u
-M1001 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=7.605e+11p pd=7.54e+06u as=6.24e+11p ps=5.82e+06u
-M1002 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand3b_2 Y C A_N B VNB VPB VGND VPWR
-M1000 VGND C a_228_47# VNB nshort w=650000u l=150000u
-+  ad=4.295e+11p pd=4.01e+06u as=4.485e+11p ps=3.98e+06u
-M1001 Y a_27_47# a_448_47# VNB nshort w=650000u l=150000u
-+  ad=2.405e+11p pd=2.04e+06u as=5.46e+11p ps=5.58e+06u
-M1002 VPWR A_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=1.4657e+12p pd=1.303e+07u as=1.134e+11p ps=1.38e+06u
-M1003 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=0p ps=0u
-M1004 a_448_47# B a_228_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_228_47# B a_448_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_228_47# C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_448_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-.ends
-.subckt sky130_fd_sc_hdll__sdfrtp_1 VPB VNB VGND VPWR RESET_B Q CLK D SCD SCE
-M1000 a_1428_47# a_1380_303# a_1322_47# VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.518e+11p ps=1.6e+06u
-M1001 a_213_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=1.3533e+12p ps=1.268e+07u
-M1002 VPWR a_1972_21# a_1951_413# VPB phighvt w=420000u l=180000u
-+  ad=1.6398e+12p pd=1.569e+07u as=1.386e+11p ps=1.5e+06u
-M1003 a_1972_21# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1004 Q a_1972_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.15e+11p pd=2.63e+06u as=0p ps=0u
-M1005 a_2157_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=0p ps=0u
-M1006 VPWR SCD a_870_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=1.971e+11p ps=1.81e+06u
-M1007 a_700_389# D a_631_119# VNB nshort w=420000u l=150000u
-+  ad=3.3215e+11p pd=3.47e+06u as=1.302e+11p ps=1.46e+06u
-M1008 a_1380_303# a_1202_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.541e+11p pd=2.37e+06u as=0p ps=0u
-M1009 a_1202_413# a_27_47# a_700_389# VNB nshort w=360000u l=150000u
-+  ad=1.44e+11p pd=1.52e+06u as=0p ps=0u
-M1010 VPWR a_1757_47# a_1972_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1972_21# a_1757_47# a_2157_47# VNB nshort w=420000u l=150000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1012 Q a_1972_21# VGND VNB nshort w=650000u l=150000u
-+  ad=1.9825e+11p pd=1.91e+06u as=0p ps=0u
-M1013 VPWR a_1380_303# a_1324_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1014 VPWR CLK a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1015 a_618_389# SCE VPWR VPB phighvt w=540000u l=180000u
-+  ad=1.242e+11p pd=1.54e+06u as=0p ps=0u
-M1016 a_1951_413# a_213_47# a_1757_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1017 a_700_389# D a_618_389# VPB phighvt w=540000u l=180000u
-+  ad=5.193e+11p pd=4.01e+06u as=0p ps=0u
-M1018 a_631_119# a_331_66# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND RESET_B a_1428_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1324_413# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1202_413# a_213_47# a_700_389# VPB phighvt w=420000u l=180000u
-+  ad=1.806e+11p pd=1.7e+06u as=0p ps=0u
-M1022 a_1324_413# a_27_47# a_1202_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1866_47# a_27_47# a_1757_47# VNB nshort w=360000u l=150000u
-+  ad=2.121e+11p pd=1.9e+06u as=1.422e+11p ps=1.51e+06u
-M1024 a_1757_47# a_213_47# a_1380_303# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.87e+11p ps=1.93e+06u
-M1025 VPWR SCE a_331_66# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=2.214e+11p ps=1.9e+06u
-M1026 VGND CLK a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1027 VGND a_1972_21# a_1866_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_213_47# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1029 a_899_66# SCE a_700_389# VNB nshort w=420000u l=500000u
-+  ad=1.554e+11p pd=1.58e+06u as=0p ps=0u
-M1030 a_1757_47# a_27_47# a_1380_303# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1322_47# a_213_47# a_1202_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND SCD a_899_66# VNB nshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_870_389# a_331_66# a_700_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND SCE a_331_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1035 a_1380_303# a_1202_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__dfrtp_4 Q D CLK VGND VPWR RESET_B VPB VNB
-M1000 a_699_413# a_27_47# a_583_47# VPB phighvt w=420000u l=180000u
-+  ad=3.528e+11p pd=3.36e+06u as=1.533e+11p ps=1.57e+06u
-M1001 a_865_47# a_811_289# a_689_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.012e+11p ps=2.3e+06u
-M1002 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.5815e+12p ps=1.392e+07u
-M1003 VGND RESET_B a_865_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=1.8817e+12p pd=1.792e+07u as=1.728e+11p ps=1.82e+06u
-M1005 a_1188_47# a_211_363# a_811_289# VNB nshort w=360000u l=150000u
-+  ad=1.782e+11p pd=1.71e+06u as=1.998e+11p ps=1.97e+06u
-M1006 VPWR a_1403_21# a_1388_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.428e+11p ps=1.52e+06u
-M1007 a_583_47# a_27_47# a_468_47# VNB nshort w=360000u l=150000u
-+  ad=1.368e+11p pd=1.48e+06u as=1.71e+11p ps=1.69e+06u
-M1008 VGND a_1403_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1009 a_1388_413# a_211_363# a_1188_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.47e+11p ps=1.54e+06u
-M1010 VPWR a_1403_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1011 VPWR a_1188_47# a_1403_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1012 a_468_47# D VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1403_21# a_1188_47# a_1612_47# VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.491e+11p ps=1.55e+06u
-M1014 a_689_47# a_211_363# a_583_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_811_289# a_699_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Q a_1403_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1403_21# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_1403_21# a_1317_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.7e+06u
-M1019 VPWR a_1403_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1317_47# a_27_47# a_1188_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1022 a_811_289# a_583_47# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.709e+11p pd=2.41e+06u as=0p ps=0u
-M1023 Q a_1403_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_468_47# D VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.386e+11p pd=1.5e+06u as=0p ps=0u
-M1025 a_583_47# a_211_363# a_468_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Q a_1403_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1028 a_1188_47# a_27_47# a_811_289# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1612_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND a_1403_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Q a_1403_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_811_289# a_583_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_699_413# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__isobufsrc_16 A X SLEEP VPB VNB VGND VPWR
-M1000 X SLEEP a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.32e+12p pd=2.064e+07u as=4.92e+12p ps=4.384e+07u
-M1001 VPWR A a_151_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.27e+12p pd=2.854e+07u as=6.8e+11p ps=5.36e+06u
-M1002 X a_151_297# VGND VNB nshort w=650000u l=150000u
-+  ad=3.393e+12p pd=3.124e+07u as=4.095e+12p ps=3.73e+07u
-M1003 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X SLEEP a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_151_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_151_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_151_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_151_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_151_297# a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_151_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_585_297# a_151_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_585_297# a_151_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_585_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_151_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_151_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_585_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_151_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_151_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_585_297# a_151_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_151_297# a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_585_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X SLEEP a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_151_297# a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_151_297# a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_151_297# A VGND VNB nshort w=650000u l=150000u
-+  ad=5.135e+11p pd=4.18e+06u as=0p ps=0u
-M1029 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_585_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_585_297# a_151_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 X SLEEP a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 X SLEEP a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND a_151_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_151_297# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR a_151_297# a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 X a_151_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 X a_151_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR a_151_297# a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_585_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_585_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VPWR A a_151_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_585_297# a_151_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 X SLEEP a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 X SLEEP a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 X a_151_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 a_151_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 VGND a_151_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 a_585_297# a_151_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 a_585_297# a_151_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 X SLEEP a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 VGND A a_151_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 VGND a_151_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1061 VGND a_151_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 a_585_297# a_151_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 a_585_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 VPWR a_151_297# a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1067 VPWR a_151_297# a_585_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1068 a_585_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 VGND A a_151_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1071 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sdlclkp_4 SCE GATE GCLK VGND VPWR CLK VPB VNB
-M1000 a_425_47# a_277_243# a_310_47# VNB nshort w=360000u l=150000u
-+  ad=2.196e+11p pd=1.96e+06u as=1.53e+11p ps=1.57e+06u
-M1001 a_27_47# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=2.664e+11p pd=2.97e+06u as=1.3078e+12p ps=1.141e+07u
-M1002 a_27_47# GATE a_117_369# VPB phighvt w=640000u l=180000u
-+  ad=2.373e+11p pd=2.08e+06u as=1.472e+11p ps=1.74e+06u
-M1003 GCLK a_1125_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=7.15e+11p pd=5.43e+06u as=2.2235e+12p ps=1.837e+07u
-M1004 GCLK a_1125_47# VGND VNB nshort w=650000u l=150000u
-+  ad=5.3625e+11p pd=4.25e+06u as=0p ps=0u
-M1005 a_421_413# a_280_21# a_310_47# VPB phighvt w=420000u l=180000u
-+  ad=1.806e+11p pd=1.7e+06u as=1.47e+11p ps=1.54e+06u
-M1006 a_280_21# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1007 a_117_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_280_21# a_277_243# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1009 VPWR CLK a_1125_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1010 VPWR a_505_315# a_421_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1125_47# a_505_315# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_310_47# a_277_243# a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_280_21# a_277_243# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1014 VGND a_1125_47# GCLK VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_505_315# a_425_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND SCE a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 GCLK a_1125_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1217_47# a_505_315# a_1125_47# VNB nshort w=650000u l=150000u
-+  ad=1.365e+11p pd=1.72e+06u as=2.015e+11p ps=1.92e+06u
-M1019 a_505_315# a_310_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1020 VPWR a_1125_47# GCLK VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND CLK a_1217_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 GCLK a_1125_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_280_21# CLK VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1024 VGND a_1125_47# GCLK VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_1125_47# GCLK VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_310_47# a_280_21# a_27_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_505_315# a_310_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sdfrbp_2 VPB VNB VPWR VGND RESET_B Q_N Q SCD SCE CLK D
-M1000 a_1428_47# a_1380_303# a_1322_47# VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.518e+11p ps=1.6e+06u
-M1001 a_213_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=1.77805e+12p ps=1.664e+07u
-M1002 VPWR a_1972_21# a_1951_413# VPB phighvt w=420000u l=180000u
-+  ad=2.2692e+12p pd=2.101e+07u as=1.386e+11p ps=1.5e+06u
-M1003 a_1972_21# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1004 Q_N a_2372_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1005 a_2157_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=0p ps=0u
-M1006 VPWR SCD a_870_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=1.971e+11p ps=1.81e+06u
-M1007 a_700_389# D a_631_119# VNB nshort w=420000u l=150000u
-+  ad=3.3215e+11p pd=3.47e+06u as=1.302e+11p ps=1.46e+06u
-M1008 a_1380_303# a_1202_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.541e+11p pd=2.37e+06u as=0p ps=0u
-M1009 a_1202_413# a_27_47# a_700_389# VNB nshort w=360000u l=150000u
-+  ad=1.44e+11p pd=1.52e+06u as=0p ps=0u
-M1010 VPWR a_1757_47# a_1972_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1972_21# a_1757_47# a_2157_47# VNB nshort w=420000u l=150000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1012 VPWR a_1380_303# a_1324_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1013 VPWR CLK a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1014 a_618_389# SCE VPWR VPB phighvt w=540000u l=180000u
-+  ad=1.242e+11p pd=1.54e+06u as=0p ps=0u
-M1015 Q a_1972_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.34e+11p pd=2.02e+06u as=0p ps=0u
-M1016 a_1951_413# a_213_47# a_1757_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1017 a_700_389# D a_618_389# VPB phighvt w=540000u l=180000u
-+  ad=5.193e+11p pd=4.01e+06u as=0p ps=0u
-M1018 a_631_119# a_331_66# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_1972_21# a_2372_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1020 VGND RESET_B a_1428_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_1972_21# a_2372_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1022 a_1324_413# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1202_413# a_213_47# a_700_389# VPB phighvt w=420000u l=180000u
-+  ad=1.806e+11p pd=1.7e+06u as=0p ps=0u
-M1024 a_1324_413# a_27_47# a_1202_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1866_47# a_27_47# a_1757_47# VNB nshort w=360000u l=150000u
-+  ad=2.121e+11p pd=1.9e+06u as=1.422e+11p ps=1.51e+06u
-M1026 a_1757_47# a_213_47# a_1380_303# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.87e+11p ps=1.93e+06u
-M1027 Q_N a_2372_47# VGND VNB nshort w=650000u l=150000u
-+  ad=2.0475e+11p pd=1.93e+06u as=0p ps=0u
-M1028 VPWR SCE a_331_66# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=2.214e+11p ps=1.9e+06u
-M1029 VGND CLK a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1030 VGND a_1972_21# a_1866_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_1972_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Q a_1972_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.3e+11p pd=2.66e+06u as=0p ps=0u
-M1033 VPWR a_1972_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_213_47# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1035 a_899_66# SCE a_700_389# VNB nshort w=420000u l=500000u
-+  ad=1.554e+11p pd=1.58e+06u as=0p ps=0u
-M1036 a_1757_47# a_27_47# a_1380_303# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1322_47# a_213_47# a_1202_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND a_2372_47# Q_N VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_2372_47# Q_N VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND SCD a_899_66# VNB nshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_870_389# a_331_66# a_700_389# VPB phighvt w=540000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VGND SCE a_331_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1043 a_1380_303# a_1202_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or3b_1 A C_N X B VGND VPWR VPB VNB
-M1000 a_225_53# B VGND VNB nshort w=420000u l=150000u
-+  ad=2.835e+11p pd=3.03e+06u as=4.787e+11p ps=4.92e+06u
-M1001 VGND A a_225_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND a_117_297# a_225_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_117_297# C_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=4.241e+11p ps=4.1e+06u
-M1004 VPWR A a_399_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.407e+11p ps=1.51e+06u
-M1005 a_399_297# B a_315_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1006 a_117_297# C_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1007 a_315_297# a_117_297# a_225_53# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1008 X a_225_53# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1009 X a_225_53# VGND VNB nshort w=650000u l=150000u
-+  ad=1.7875e+11p pd=1.85e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o32ai_1 A2 Y A1 A3 B2 B1 VPB VNB VGND VPWR
-M1000 VPWR A1 a_465_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.6e+11p pd=5.12e+06u as=2.9e+11p ps=2.58e+06u
-M1001 VGND A3 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=6.0125e+11p pd=4.45e+06u as=5.655e+11p ps=5.64e+06u
-M1002 Y B2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.15e+11p pd=3.03e+06u as=2.3e+11p ps=2.46e+06u
-M1003 a_117_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_465_297# A2 a_338_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=4.55e+11p ps=2.91e+06u
-M1005 a_27_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.4375e+11p ps=2.05e+06u
-M1006 Y B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_338_297# A3 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__xor2_1 B X A VNB VPB VPWR VGND
-M1000 VPWR A a_125_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.6e+11p pd=5.12e+06u as=3e+11p ps=2.6e+06u
-M1001 X a_35_297# a_315_297# VPB phighvt w=1e+06u l=180000u
-+  ad=4.5e+11p pd=2.9e+06u as=5.7e+11p ps=5.14e+06u
-M1002 a_35_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=1.82e+11p pd=1.86e+06u as=7.28e+11p ps=6.14e+06u
-M1003 VGND A a_35_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_35_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.46e+11p ps=2.98e+06u
-M1005 VPWR B a_315_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_125_297# B a_35_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1007 a_317_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=0p ps=0u
-M1008 X B a_317_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_315_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o21ba_1 B1_N A1 X A2 VNB VPB VGND VPWR
-M1000 a_79_199# a_222_93# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=9.257e+11p ps=7.95e+06u
-M1001 a_222_93# B1_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1002 a_222_93# B1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=3.76e+11p ps=3.81e+06u
-M1003 a_460_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=4.29e+11p pd=3.92e+06u as=0p ps=0u
-M1004 VGND A2 a_460_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_79_199# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1006 VPWR A1 a_554_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1007 VGND a_79_199# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1008 a_554_297# A2 a_79_199# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_460_47# a_222_93# a_79_199# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.95e+11p ps=1.9e+06u
-.ends
-.subckt sky130_fd_sc_hdll__or4bb_1 A X B D_N C_N VPWR VGND VPB VNB
-M1000 X a_331_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.64325e+11p ps=5.4e+06u
-M1001 a_609_297# B a_527_297# VPB phighvt w=420000u l=180000u
-+  ad=1.281e+11p pd=1.45e+06u as=9.66e+10p ps=1.3e+06u
-M1002 a_421_413# a_216_93# a_331_413# VPB phighvt w=420000u l=180000u
-+  ad=2.514e+11p pd=2.7e+06u as=1.134e+11p ps=1.38e+06u
-M1003 a_216_93# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.281e+11p pd=1.45e+06u as=6.2055e+11p ps=6.43e+06u
-M1004 a_331_413# B VGND VNB nshort w=420000u l=150000u
-+  ad=2.814e+11p pd=3.02e+06u as=0p ps=0u
-M1005 VGND A a_331_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C_N a_27_410# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1007 VGND a_27_410# a_331_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A a_609_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_331_413# VGND VNB nshort w=650000u l=150000u
-+  ad=1.7875e+11p pd=1.85e+06u as=0p ps=0u
-M1010 a_331_413# a_216_93# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR C_N a_27_410# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1012 a_216_93# D_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1013 a_527_297# a_27_410# a_421_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and4_4 X C A B D VNB VPB VGND VPWR
-M1000 VPWR D a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=1.51e+12p pd=1.302e+07u as=7.4e+11p ps=5.48e+06u
-M1001 a_198_47# B a_119_47# VNB nshort w=650000u l=150000u
-+  ad=2.47e+11p pd=2.06e+06u as=1.5925e+11p ps=1.79e+06u
-M1002 VPWR B a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_47# C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=6.24e+11p pd=5.82e+06u as=4.485e+11p ps=3.98e+06u
-M1005 VGND D a_304_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.1525e+11p ps=2.27e+06u
-M1006 a_27_47# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1008 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_119_47# A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1013 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_304_47# C a_198_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o221ai_1 A2 Y B1 C1 A1 B2 VPB VNB VGND VPWR
-M1000 Y B2 a_351_297# VPB phighvt w=1e+06u l=180000u
-+  ad=7.6e+11p pd=5.52e+06u as=2.6e+11p ps=2.52e+06u
-M1001 VPWR C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.24e+12p pd=6.48e+06u as=0p ps=0u
-M1002 a_569_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=2.3e+11p pd=2.46e+06u as=0p ps=0u
-M1003 VPWR A1 a_569_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_123_47# C1 Y VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=2.145e+11p ps=1.96e+06u
-M1005 a_261_47# B2 a_123_47# VNB nshort w=650000u l=150000u
-+  ad=6.695e+11p pd=5.96e+06u as=0p ps=0u
-M1006 a_261_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1007 a_123_47# B1 a_261_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_261_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_351_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor3b_1 C_N Y A B VPB VNB VGND VPWR
-M1000 a_91_199# C_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=4.62e+11p ps=4.11e+06u
-M1001 a_263_297# B a_169_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=2.9e+11p ps=2.58e+06u
-M1002 a_169_297# a_91_199# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.3e+11p ps=2.66e+06u
-M1003 a_91_199# C_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=3.057e+11p ps=2.71e+06u
-M1004 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=4.29e+11p pd=3.92e+06u as=0p ps=0u
-M1005 VGND a_91_199# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_263_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__mux2_16 VPWR VGND VPB VNB X S A1 A0
-M1000 a_119_47# S VGND VNB nshort w=650000u l=150000u
-+  ad=7.02e+11p pd=7.36e+06u as=3.4515e+12p ps=3.012e+07u
-M1001 VGND a_973_297# a_1163_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.02e+11p ps=7.36e+06u
-M1002 a_27_47# A1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.66e+12p pd=1.532e+07u as=1.16e+12p ps=1.032e+07u
-M1003 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=4.27e+12p pd=3.854e+07u as=2.32e+12p ps=2.064e+07u
-M1004 a_27_47# A0 a_1163_47# VNB nshort w=650000u l=150000u
-+  ad=1.287e+12p pd=1.176e+07u as=0p ps=0u
-M1005 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.404e+12p ps=1.472e+07u
-M1006 a_117_297# a_973_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR S a_597_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1008 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_597_297# A0 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1163_47# a_973_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_47# A0 a_597_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1163_47# A0 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR S a_973_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1014 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_597_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_47# A1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_597_297# A0 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND S a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_119_47# S VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_973_297# a_1163_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_117_297# A1 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR a_973_297# a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_27_47# A0 a_597_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_973_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_27_47# A1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_117_297# a_973_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_973_297# S VGND VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=0p ps=0u
-M1043 VGND S a_973_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_119_47# A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_27_47# A0 a_1163_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VPWR S a_597_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 a_1163_47# a_973_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 a_1163_47# A0 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 a_117_297# A1 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 VPWR a_973_297# a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 a_27_47# A1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1061 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 VGND S a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 a_597_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 a_119_47# A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1067 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand4_4 A D C B Y VPWR VGND VPB VNB
-M1000 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=3.15e+12p pd=2.43e+07u as=2.32e+12p ps=2.064e+07u
-M1001 VPWR D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=9.62e+11p pd=9.46e+06u as=4.16e+11p ps=3.88e+06u
-M1003 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_883_47# B a_485_47# VNB nshort w=650000u l=150000u
-+  ad=1.0335e+12p pd=9.68e+06u as=8.645e+11p ps=7.86e+06u
-M1006 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_485_47# B a_883_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_883_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1009 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A a_883_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_47# C a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_883_47# B a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_485_47# C a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_485_47# B a_883_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND D a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_883_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_27_47# C a_485_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A a_883_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_485_47# C a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND D a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__decap_8 VPWR VGND VPB VNB
-M1000 VPWR VGND VPWR VPB phighvt w=870000u l=2.89e+06u
-+  ad=4.524e+11p pd=4.52e+06u as=0p ps=0u
-M1001 VGND VPWR VGND VNB nshort w=550000u l=2.89e+06u
-+  ad=2.86e+11p pd=3.24e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__diode_2 DIODE VGND VPWR VPB VNB
-D0 VNB DIODE ndiode p=5.36e+06u a=4.347e+11p
-.ends
-.subckt sky130_fd_sc_hdll__o31ai_1 Y A2 A1 A3 B1 VPB VNB VPWR VGND
-M1000 a_117_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=5.4e+11p ps=5.08e+06u
-M1001 VGND A2 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=5.33e+11p ps=4.24e+06u
-M1002 Y B1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=2.535e+11p pd=2.08e+06u as=0p ps=0u
-M1003 Y A3 a_213_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=3.16e+06u as=2.9e+11p ps=2.58e+06u
-M1004 a_119_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_119_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_213_297# A2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__clkinv_12 Y A VNB VPB VGND VPWR
-M1000 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=2.86e+12p pd=2.572e+07u as=2.61e+12p ps=2.322e+07u
-M1001 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=6.804e+11p pd=8.28e+06u as=1.323e+12p ps=1.218e+07u
-M1003 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  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 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  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 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and3b_4 A_N X C B VNB VPB VGND VPWR
-M1000 VGND C a_277_47# VNB nshort w=650000u l=150000u
-+  ad=7.285e+11p pd=6.23e+06u as=1.82e+11p ps=1.86e+06u
-M1001 VPWR a_56_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.3907e+12p pd=1.088e+07u as=6.1e+11p ps=5.22e+06u
-M1002 X a_56_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR C a_56_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=6.6e+11p ps=5.32e+06u
-M1004 X a_56_297# VGND VNB nshort w=650000u l=150000u
-+  ad=4.615e+11p pd=4.02e+06u as=0p ps=0u
-M1005 VPWR a_98_199# a_56_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_56_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_56_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_56_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_162_47# a_98_199# a_56_297# VNB nshort w=650000u l=150000u
-+  ad=2.7625e+11p pd=2.15e+06u as=2.3075e+11p ps=2.01e+06u
-M1010 VGND a_56_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_98_199# A_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.239e+11p pd=1.43e+06u as=0p ps=0u
-M1012 VPWR a_56_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_98_199# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.743e+11p pd=1.67e+06u as=0p ps=0u
-M1014 a_277_47# B a_162_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_56_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__einvn_1 Z A TE_B VGND VPWR VPB VNB
-M1000 a_316_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=3.8025e+11p pd=2.47e+06u as=5.255e+11p ps=2.97e+06u
-M1001 VPWR TE_B a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=3.144e+11p pd=2.69e+06u as=1.728e+11p ps=1.82e+06u
-M1002 VGND TE_B a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1003 Z A a_222_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=1.065e+12p ps=4.13e+06u
-M1004 a_222_297# TE_B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Z A a_316_47# VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__dfstp_2 Q VGND CLK VPWR D VPB VNB SET_B
-M1000 VPWR SET_B a_1126_413# VPB phighvt w=420000u l=180000u
-+  ad=1.6789e+12p pd=1.611e+07u as=2.856e+11p ps=3.04e+06u
-M1001 VPWR a_1738_47# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1002 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.33055e+12p ps=1.269e+07u
-M1003 a_506_47# a_27_47# a_409_329# VNB nshort w=360000u l=150000u
-+  ad=1.8e+11p pd=1.72e+06u as=1.87e+11p ps=1.93e+06u
-M1004 a_1344_47# a_27_47# a_1126_413# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.596e+11p ps=1.6e+06u
-M1005 VGND a_1126_413# a_1738_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1006 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1007 VPWR a_702_21# a_610_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.974e+11p ps=1.78e+06u
-M1008 Q a_1738_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_1288_261# a_1244_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=9.66e+10p ps=1.3e+06u
-M1010 a_1126_413# a_211_363# a_1156_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1011 a_1044_413# a_506_47# VPWR VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=0p ps=0u
-M1012 VPWR a_1126_413# a_1738_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1013 a_409_329# D VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_409_329# D VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.625e+11p pd=2.39e+06u as=0p ps=0u
-M1015 a_1156_47# a_506_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_636_47# a_211_363# a_506_47# VNB nshort w=360000u l=150000u
-+  ad=1.341e+11p pd=1.5e+06u as=0p ps=0u
-M1017 VPWR a_506_47# a_702_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1018 a_1288_261# a_1126_413# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1019 a_610_413# a_27_47# a_506_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1020 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1021 a_866_47# SET_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1022 VGND a_1738_47# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.405e+11p ps=2.04e+06u
-M1023 VGND a_702_21# a_636_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1288_261# a_1126_413# VGND VNB nshort w=540000u l=150000u
-+  ad=1.404e+11p pd=1.6e+06u as=0p ps=0u
-M1025 a_1244_413# a_211_363# a_1126_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_702_21# a_506_47# a_866_47# VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1027 a_702_21# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1029 a_506_47# a_211_363# a_409_329# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1416_47# a_1288_261# a_1344_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1031 a_1126_413# a_27_47# a_1044_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND SET_B a_1416_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Q a_1738_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__xnor2_4 Y B A VNB VPB VGND VPWR
-M1000 VPWR A a_898_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.32e+12p pd=2.064e+07u as=1.41e+12p ps=1.282e+07u
-M1001 Y a_38_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.41e+12p pd=1.282e+07u as=0p ps=0u
-M1002 VGND B a_980_47# VNB nshort w=650000u l=150000u
-+  ad=1.378e+12p pd=1.334e+07u as=1.443e+12p ps=1.354e+07u
-M1003 a_980_47# a_38_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.485e+11p ps=3.98e+06u
-M1004 VGND A a_980_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_38_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.43e+12p pd=1.286e+07u as=0p ps=0u
-M1006 Y B a_898_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_38_297# B a_38_47# VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=9.425e+11p ps=9.4e+06u
-M1008 VPWR a_38_297# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_38_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_980_47# a_38_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_980_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B a_38_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_898_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y a_38_297# a_980_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_38_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_38_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_38_297# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A a_898_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_38_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_898_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_38_47# B a_38_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_980_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND B a_980_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y a_38_297# a_980_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A a_980_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_898_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_38_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y B a_898_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y a_38_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND A a_38_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_38_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND A a_38_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_980_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR B a_38_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR A a_38_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_898_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_38_297# B a_38_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_38_47# B a_38_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_980_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or4b_4 D_N B C A X VNB VPB VGND VPWR
-M1000 VPWR a_225_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.0734e+12p pd=9.3e+06u as=5.8e+11p ps=5.16e+06u
-M1001 VPWR A a_525_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1002 X a_225_297# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=1.2023e+12p ps=1.127e+07u
-M1003 a_117_413# D_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1004 X a_225_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A a_225_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.55e+11p ps=4e+06u
-M1006 a_525_297# B a_431_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1007 a_225_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_431_297# C a_315_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=4e+11p ps=2.8e+06u
-M1009 VPWR a_225_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_225_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_225_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND C a_225_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_117_413# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.0785e+11p pd=1.36e+06u as=0p ps=0u
-M1014 a_225_297# a_117_413# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_225_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_225_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_315_297# a_117_413# a_225_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-.ends
-.subckt sky130_fd_sc_hdll__a2bb2o_4 X B1 B2 A1_N A2_N VNB VPB VGND VPWR
-M1000 a_455_21# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=3.835e+11p pd=3.78e+06u as=1.716e+12p ps=1.438e+07u
-M1001 a_27_297# B2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.12e+12p pd=1.024e+07u as=1.7e+12p ps=1.54e+07u
-M1002 X a_203_47# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1003 X a_203_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1004 VPWR A1_N a_785_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1005 a_27_297# a_455_21# a_203_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1006 a_203_47# B2 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=4.81e+11p pd=4.08e+06u as=3.835e+11p ps=3.78e+06u
-M1007 VGND a_203_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_203_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A1_N a_455_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_203_47# a_455_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_203_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_785_297# A2_N a_455_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1014 VGND a_455_21# a_203_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_203_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_455_21# A2_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_119_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND B1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_455_21# A2_N a_785_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_203_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_203_47# a_455_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_203_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A2_N a_455_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_785_297# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_119_47# B2 a_203_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor4_2 C D Y A B VNB VPB VGND VPWR
-M1000 a_309_297# C a_515_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=8.5e+11p ps=7.7e+06u
-M1001 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=8.7e+11p ps=7.74e+06u
-M1002 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=1.066e+12p pd=1.108e+07u as=9.62e+11p ps=8.16e+06u
-M1003 a_27_297# B a_309_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_309_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_515_297# D Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1009 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y D a_515_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND D Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_515_297# C a_309_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__xor3_4 X C B A VNB VPB VGND VPWR
-M1000 VPWR a_80_207# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.4908e+12p pd=1.305e+07u as=5.8e+11p ps=5.16e+06u
-M1001 a_658_49# a_528_297# a_80_207# VPB phighvt w=840000u l=180000u
-+  ad=7.558e+11p pd=5.2e+06u as=3.36e+11p ps=2.48e+06u
-M1002 VGND a_80_207# X VNB nshort w=650000u l=150000u
-+  ad=1.2254e+12p pd=1.035e+07u as=4.16e+11p ps=3.88e+06u
-M1003 a_658_49# B a_1225_365# VNB nshort w=640000u l=150000u
-+  ad=5.931e+11p pd=4.52e+06u as=4.468e+11p ps=3.98e+06u
-M1004 a_1109_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=1.653e+11p pd=1.82e+06u as=0p ps=0u
-M1005 a_80_207# C a_658_49# VNB nshort w=640000u l=150000u
-+  ad=2.88e+11p pd=2.18e+06u as=0p ps=0u
-M1006 a_1225_365# a_1109_297# a_658_49# VPB phighvt w=840000u l=180000u
-+  ad=7.234e+11p pd=5.3e+06u as=0p ps=0u
-M1007 a_80_207# C a_652_325# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=7.32e+11p ps=5.16e+06u
-M1008 a_658_49# B a_1510_297# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=7.748e+11p ps=5.63e+06u
-M1009 VPWR A a_1225_365# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1510_297# a_1225_365# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_80_207# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_80_207# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_652_325# a_528_297# a_80_207# VNB nshort w=640000u l=150000u
-+  ad=6.6045e+11p pd=4.67e+06u as=0p ps=0u
-M1014 a_1510_297# a_1109_297# a_652_325# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A a_1225_365# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_80_207# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_80_207# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_652_325# B a_1225_365# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_80_207# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_528_297# C VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.112e+11p pd=1.94e+06u as=0p ps=0u
-M1021 a_1510_297# a_1109_297# a_658_49# VNB nshort w=420000u l=150000u
-+  ad=5.517e+11p pd=4.37e+06u as=0p ps=0u
-M1022 a_1109_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.126e+11p pd=2.64e+06u as=0p ps=0u
-M1023 a_528_297# C VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1024 a_1510_297# a_1225_365# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_80_207# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_652_325# B a_1510_297# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1225_365# a_1109_297# a_652_325# VNB nshort w=600000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__dlrtp_4 RESET_B D GATE Q VGND VPWR VPB VNB
-M1000 Q a_750_21# VGND VNB nshort w=650000u l=150000u
-+  ad=3.51e+11p pd=3.68e+06u as=1.00625e+12p ps=1.01e+07u
-M1001 VGND a_750_21# a_708_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1002 Q a_750_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.691e+12p ps=1.487e+07u
-M1003 VPWR GATE a_27_363# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1004 VPWR a_750_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_203_47# a_27_363# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1006 VPWR a_750_21# a_702_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1007 VGND a_750_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_503_369# a_319_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=0p ps=0u
-M1009 a_708_47# a_27_363# a_604_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1010 Q a_750_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Q a_750_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND D a_319_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1013 VPWR D a_319_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1014 VGND RESET_B a_981_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.6575e+11p ps=1.81e+06u
-M1015 a_604_47# a_203_47# a_500_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1016 VPWR RESET_B a_750_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1017 a_981_47# a_604_47# a_750_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1018 VGND GATE a_27_363# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1019 a_702_413# a_203_47# a_604_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1020 a_203_47# a_27_363# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1021 a_604_47# a_27_363# a_503_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_750_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_500_47# a_319_369# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_750_21# a_604_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_750_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__isobufsrc_8 A X SLEEP VPB VNB VGND VPWR
-M1000 VPWR a_117_297# a_345_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.76e+12p pd=1.552e+07u as=2.6e+12p ps=2.32e+07u
-M1001 VPWR A a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.4e+11p ps=2.68e+06u
-M1002 a_345_297# a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_345_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1004 a_345_297# a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_117_297# a_345_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=1.729e+12p pd=1.572e+07u as=2.249e+12p ps=1.992e+07u
-M1007 X SLEEP a_345_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_345_297# a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_345_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_117_297# a_345_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A a_117_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1019 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X SLEEP a_345_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_345_297# a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_345_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_117_297# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_345_297# SLEEP X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 X a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_117_297# a_345_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND a_117_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 X SLEEP a_345_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 X SLEEP a_345_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a32o_1 X A3 B2 B1 A1 A2 VGND VPWR VPB VNB
-M1000 a_276_47# A3 VGND VNB nshort w=650000u l=150000u
-+  ad=1.95e+11p pd=1.9e+06u as=6.045e+11p ps=4.46e+06u
-M1001 VPWR a_93_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=9.75e+11p pd=5.95e+06u as=3.4e+11p ps=2.68e+06u
-M1002 a_93_21# B1 a_268_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=1.015e+12p ps=8.03e+06u
-M1003 a_93_21# A1 a_366_47# VNB nshort w=650000u l=150000u
-+  ad=3.185e+11p pd=2.28e+06u as=3.575e+11p ps=2.4e+06u
-M1004 a_366_47# A2 a_276_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_93_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.145e+11p ps=1.96e+06u
-M1006 a_634_47# B1 a_93_21# VNB nshort w=650000u l=150000u
-+  ad=1.365e+11p pd=1.72e+06u as=0p ps=0u
-M1007 VPWR A2 a_268_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_268_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_268_297# A3 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_268_297# B2 a_93_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B2 a_634_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__buf_4 VPWR VGND X A VPB VNB
-M1000 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=8.5e+11p ps=7.7e+06u
-M1001 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=5.85e+11p ps=5.7e+06u
-M1002 VPWR A a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1003 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1007 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__inv_4 Y A VPB VNB VPWR VGND
-M1000 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.075e+12p pd=8.15e+06u as=5.8e+11p ps=5.16e+06u
-M1001 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=7.3775e+11p ps=6.17e+06u
-M1003 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__dfrtp_2 RESET_B VPWR VGND Q CLK D VPB VNB
-M1000 a_436_413# D VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.428e+11p pd=1.52e+06u as=1.5845e+12p ps=1.543e+07u
-M1001 VPWR a_1323_21# a_1330_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=9.66e+10p ps=1.3e+06u
-M1002 VPWR a_1323_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1003 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=1.3154e+12p ps=1.178e+07u
-M1004 a_649_413# a_27_47# a_534_47# VPB phighvt w=420000u l=180000u
-+  ad=3.318e+11p pd=3.26e+06u as=1.533e+11p ps=1.57e+06u
-M1005 a_805_47# a_751_289# a_642_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.748e+11p ps=2.17e+06u
-M1006 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1007 VGND RESET_B a_805_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_436_413# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.338e+11p pd=1.5e+06u as=0p ps=0u
-M1009 VGND a_1323_21# a_1237_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.698e+11p ps=1.7e+06u
-M1010 VPWR a_751_289# a_649_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_751_289# a_534_47# VGND VNB nshort w=640000u l=150000u
-+  ad=1.998e+11p pd=1.97e+06u as=0p ps=0u
-M1012 Q a_1323_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_1128_47# a_1323_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1014 a_1128_47# a_211_363# a_751_289# VNB nshort w=360000u l=150000u
-+  ad=1.422e+11p pd=1.51e+06u as=0p ps=0u
-M1015 a_534_47# a_27_47# a_436_413# VNB nshort w=360000u l=150000u
-+  ad=1.404e+11p pd=1.5e+06u as=0p ps=0u
-M1016 Q a_1323_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.405e+11p pd=2.04e+06u as=0p ps=0u
-M1017 a_751_289# a_534_47# VPWR VPB phighvt w=840000u l=180000u
-+  ad=2.709e+11p pd=2.41e+06u as=0p ps=0u
-M1018 a_1128_47# a_27_47# a_751_289# VPB phighvt w=420000u l=180000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1019 a_642_47# a_211_363# a_534_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1237_47# a_27_47# a_1128_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1542_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.596e+11p pd=1.6e+06u as=0p ps=0u
-M1022 a_1323_21# a_1128_47# a_1542_47# VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1023 a_649_413# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1025 a_1323_21# RESET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_1323_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1028 a_534_47# a_211_363# a_436_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1330_413# a_211_363# a_1128_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor4b_4 B A D_N C Y VPB VNB VGND VPWR
-M1000 a_27_297# B a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.41e+12p pd=1.282e+07u as=1.16e+12p ps=1.032e+07u
-M1001 VGND a_1311_21# Y VNB nshort w=650000u l=150000u
-+  ad=2.2815e+12p pd=2.002e+07u as=1.7615e+12p ps=1.582e+07u
-M1002 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.7e+11p ps=7.74e+06u
-M1003 Y a_1311_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_493_297# C a_883_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.41e+12p ps=1.282e+07u
-M1005 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_493_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_883_297# C a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# B a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y a_1311_21# a_883_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1013 VPWR D_N a_1311_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1014 VGND a_1311_21# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_493_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_883_297# a_1311_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_493_297# C a_883_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y a_1311_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y a_1311_21# a_883_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_883_297# a_1311_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND D_N a_1311_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1028 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_883_297# C a_493_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a211oi_4 A2 A1 C1 Y B1 VPWR VGND VNB VPB
-M1000 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.99e+12p pd=1.798e+07u as=1.16e+12p ps=1.032e+07u
-M1001 VGND C1 Y VNB nshort w=650000u l=150000u
-+  ad=1.404e+12p pd=1.342e+07u as=1.365e+12p ps=1.2e+07u
-M1002 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A2 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.995e+11p ps=7.66e+06u
-M1004 Y C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_869_297# C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=5.9e+11p pd=5.18e+06u as=6.2e+11p ps=5.24e+06u
-M1007 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1057_297# B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.2e+11p pd=2.64e+06u as=0p ps=0u
-M1010 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A2 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_119_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C1 a_1057_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_297# B1 a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y C1 a_869_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_119_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_869_297# B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1449_297# C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=3.3e+11p pd=2.66e+06u as=0p ps=0u
-M1027 a_27_297# B1 a_1449_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_119_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y A1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_119_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sdlclkp_2 CLK VPWR VGND GCLK SCE GATE VPB VNB
-M1000 a_484_315# a_299_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=1.6654e+12p ps=1.474e+07u
-M1001 a_269_21# CLK VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1002 a_27_47# GATE a_117_369# VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=1.472e+11p ps=1.74e+06u
-M1003 VPWR a_1093_47# GCLK VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1004 a_1185_47# a_484_315# a_1093_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.302e+11p ps=1.46e+06u
-M1005 VGND CLK a_1185_47# VNB nshort w=420000u l=150000u
-+  ad=9.4605e+11p pd=9.05e+06u as=0p ps=0u
-M1006 a_484_315# a_299_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1007 a_117_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_415_47# a_266_243# a_299_47# VNB nshort w=360000u l=150000u
-+  ad=1.977e+11p pd=1.85e+06u as=1.548e+11p ps=1.58e+06u
-M1009 a_410_413# a_269_21# a_299_47# VPB phighvt w=420000u l=180000u
-+  ad=1.596e+11p pd=1.6e+06u as=1.47e+11p ps=1.54e+06u
-M1010 VPWR a_484_315# a_410_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 GCLK a_1093_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_1093_47# GCLK VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1013 VPWR CLK a_1093_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.856e+11p ps=1.86e+06u
-M1014 GCLK a_1093_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_484_315# a_415_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_269_21# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1017 VGND a_269_21# a_266_243# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1018 a_299_47# a_269_21# a_27_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=2.622e+11p ps=2.95e+06u
-M1019 a_1093_47# a_484_315# VPWR VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND SCE a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_299_47# a_266_243# a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_269_21# a_266_243# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1023 a_27_47# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a22oi_1 B1 A1 B2 A2 Y VPWR VGND VPB VNB
-M1000 Y B1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=5.8e+11p ps=5.16e+06u
-M1001 Y B1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=1.755e+11p ps=1.84e+06u
-M1002 a_117_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_411_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=0p ps=0u
-M1004 VPWR A2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1005 a_117_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2 a_411_47# VNB nshort w=650000u l=150000u
-+  ad=4.29e+11p pd=3.92e+06u as=0p ps=0u
-M1007 a_119_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__muxb4to1_1 S[0] D[0] D[1] S[1] S[2] D[2] D[3] S[3] VPB
-+ VNB VGND VPWR Z
-M1000 a_937_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=9.997e+11p ps=9.4e+06u
-M1001 a_1361_47# S[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=1.69e+12p ps=1.338e+07u
-M1002 a_1574_47# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=5.408e+11p ps=6.24e+06u
-M1003 a_734_333# a_533_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=8.856e+11p ps=8.72e+06u
-M1004 Z S[2] a_937_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_1562_333# a_1361_47# Z VPB phighvt w=820000u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1006 a_746_47# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1007 a_117_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1008 VPWR D[3] a_1562_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Z a_184_265# a_117_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_533_47# S[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1011 a_945_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.297e+11p pd=2.69e+06u as=0p ps=0u
-M1012 Z a_1012_265# a_945_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR S[0] a_184_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1014 VPWR S[2] a_1012_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1015 a_1361_47# S[3] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1016 a_533_47# S[1] VGND VNB nshort w=520000u l=150000u
-+  ad=1.482e+11p pd=1.61e+06u as=0p ps=0u
-M1017 VGND S[0] a_184_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1018 VGND D[1] a_746_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR D[1] a_734_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND D[3] a_1574_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_109_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.95e+06u as=0p ps=0u
-M1022 VGND S[2] a_1012_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.61e+06u
-M1023 Z S[0] a_109_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o221a_1 A2 X B1 C1 A1 B2 VPB VNB VGND VPWR
-M1000 a_124_47# B2 a_230_47# VNB nshort w=650000u l=150000u
-+  ad=4.16e+11p pd=3.88e+06u as=3.9975e+11p ps=3.83e+06u
-M1001 VPWR A1 a_515_297# VPB phighvt w=1e+06u l=180000u
-+  ad=7e+11p pd=5.4e+06u as=2.3e+11p ps=2.46e+06u
-M1002 VGND A1 a_230_47# VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=0p ps=0u
-M1003 a_228_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.3e+11p pd=2.46e+06u as=0p ps=0u
-M1004 a_515_297# A2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.14e+12p ps=6.28e+06u
-M1005 a_27_297# B2 a_228_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_27_297# VGND VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=0p ps=0u
-M1007 a_230_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_230_47# B1 a_124_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_27_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1010 a_124_47# C1 a_27_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1011 VPWR C1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__dlxtn_1 VGND VPWR Q GATE_N D VPB VNB
-M1000 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=6.009e+11p ps=6.32e+06u
-M1001 VPWR GATE_N a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=7.846e+11p pd=7.7e+06u as=1.728e+11p ps=1.82e+06u
-M1002 VPWR a_607_47# a_760_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1003 Q a_760_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=0p ps=0u
-M1004 a_716_413# a_27_47# a_607_47# VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=1.512e+11p ps=1.56e+06u
-M1005 VPWR a_760_21# a_716_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_607_47# a_760_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1007 a_503_369# a_319_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=0p ps=0u
-M1008 VGND D a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1009 a_499_47# a_319_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.554e+11p pd=1.62e+06u as=0p ps=0u
-M1010 a_695_47# a_211_363# a_607_47# VNB nshort w=360000u l=150000u
-+  ad=1.32e+11p pd=1.49e+06u as=1.044e+11p ps=1.3e+06u
-M1011 VPWR D a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1012 VGND GATE_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1013 Q a_760_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.4e+11p pd=2.68e+06u as=0p ps=0u
-M1014 a_607_47# a_27_47# a_499_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1016 VGND a_760_21# a_695_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_607_47# a_211_363# a_503_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and4_2 X C A B D VNB VPB VGND VPWR
-M1000 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=5.1575e+11p pd=4.24e+06u as=2.795e+11p ps=2.16e+06u
-M1001 VGND D a_301_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
-M1002 a_27_47# A VPWR VPB phighvt w=420000u l=180000u
-+  ad=2.478e+11p pd=2.86e+06u as=9.943e+11p ps=8.44e+06u
-M1003 a_27_47# C VPWR VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.5e+11p pd=2.7e+06u as=0p ps=0u
-M1005 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_203_47# B a_119_47# VNB nshort w=420000u l=150000u
-+  ad=1.428e+11p pd=1.52e+06u as=1.134e+11p ps=1.38e+06u
-M1007 a_119_47# A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1008 VPWR B a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_301_47# C a_203_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR D a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o21bai_1 A1 Y B1_N A2 VPB VNB VPWR VGND
-M1000 VPWR A1 a_425_297# VPB phighvt w=1e+06u l=180000u
-+  ad=6.607e+11p pd=5.42e+06u as=2.8e+11p ps=2.56e+06u
-M1001 a_425_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.2e+11p ps=2.64e+06u
-M1002 a_105_352# B1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=3.615e+11p ps=3.5e+06u
-M1003 VGND A2 a_327_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.965e+11p ps=3.82e+06u
-M1004 a_327_47# a_105_352# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1005 a_327_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR B1_N a_105_352# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1007 Y a_105_352# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a22o_1 A1 A2 X B2 B1 VPWR VGND VPB VNB
-M1000 a_27_297# B1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=6.3e+11p ps=5.26e+06u
-M1001 VGND A2 a_411_47# VNB nshort w=650000u l=150000u
-+  ad=4.355e+11p pd=3.94e+06u as=2.405e+11p ps=2.04e+06u
-M1002 a_27_297# B1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=4.03e+11p pd=3.84e+06u as=1.755e+11p ps=1.84e+06u
-M1003 a_117_297# B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_411_47# A1 a_27_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=6e+11p pd=5.2e+06u as=0p ps=0u
-M1006 X a_27_297# VGND VNB nshort w=650000u l=150000u
-+  ad=2.6e+11p pd=2.1e+06u as=0p ps=0u
-M1007 X a_27_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=4.1e+11p pd=2.82e+06u as=0p ps=0u
-M1008 a_117_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_119_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sdfbbp_1 SCD SCE RESET_B VGND CLK Q VPWR D Q_N SET_B VPB
-+ VNB
-M1000 a_2216_47# SET_B VGND VNB nshort w=420000u l=150000u
-+  ad=3.931e+11p pd=3.84e+06u as=1.5247e+12p ps=1.429e+07u
-M1001 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1002 a_2058_21# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=2.583e+11p pd=2.38e+06u as=2.152e+12p ps=1.881e+07u
-M1003 VGND SCE a_453_315# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.365e+11p ps=1.49e+06u
-M1004 a_810_413# SCE VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1005 Q_N a_2058_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.3075e+11p pd=2.01e+06u as=0p ps=0u
-M1006 a_1105_413# a_27_47# a_1003_47# VPB phighvt w=420000u l=180000u
-+  ad=1.974e+11p pd=1.78e+06u as=1.218e+11p ps=1.42e+06u
-M1007 a_2216_47# a_1525_21# a_2058_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.016e+11p ps=1.91e+06u
-M1008 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1009 a_1353_47# SET_B VGND VNB nshort w=420000u l=150000u
-+  ad=4.387e+11p pd=4.01e+06u as=0p ps=0u
-M1010 a_1864_47# a_211_363# a_1769_47# VNB nshort w=360000u l=150000u
-+  ad=1.764e+11p pd=1.7e+06u as=1.87e+11p ps=1.93e+06u
-M1011 VPWR SCE a_453_315# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.449e+11p ps=1.53e+06u
-M1012 a_1197_21# SET_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=3.066e+11p pd=2.5e+06u as=0p ps=0u
-M1013 a_1197_21# a_1003_47# a_1353_47# VNB nshort w=640000u l=150000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1014 VGND a_2058_21# a_1992_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.341e+11p ps=1.5e+06u
-M1015 VPWR a_1197_21# a_1105_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Q a_2845_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1017 VPWR RESET_B a_1525_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1018 a_409_363# SCD VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.472e+11p pd=1.74e+06u as=0p ps=0u
-M1019 a_1121_47# a_211_363# a_1003_47# VNB nshort w=360000u l=150000u
-+  ad=1.521e+11p pd=1.6e+06u as=1.584e+11p ps=1.6e+06u
-M1020 a_1003_47# a_211_363# a_483_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=3.219e+11p ps=3.37e+06u
-M1021 a_1353_47# a_1525_21# a_1197_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_483_47# a_453_315# a_409_363# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_411_47# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1024 a_483_47# SCE a_411_47# VNB nshort w=420000u l=150000u
-+  ad=2.805e+11p pd=3.04e+06u as=0p ps=0u
-M1025 VGND a_1197_21# a_1121_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_1525_21# a_1469_329# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=2.436e+11p ps=2.26e+06u
-M1027 a_1003_47# a_27_47# a_483_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND RESET_B a_1525_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1029 VPWR a_2058_21# a_1968_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.932e+11p ps=1.76e+06u
-M1030 VPWR a_2058_21# a_2845_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1031 a_1469_329# a_1003_47# a_1197_21# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1968_413# a_211_363# a_1864_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1033 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1034 a_2320_329# a_1864_47# a_2058_21# VPB phighvt w=840000u l=180000u
-+  ad=1.932e+11p pd=2.14e+06u as=0p ps=0u
-M1035 a_483_47# D a_824_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1036 VPWR a_1525_21# a_2320_329# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1769_47# a_1197_21# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1039 Q_N a_2058_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.65e+11p pd=2.73e+06u as=0p ps=0u
-M1040 a_2058_21# a_1864_47# a_2216_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_1710_329# a_1197_21# VPWR VPB phighvt w=840000u l=180000u
-+  ad=4.032e+11p pd=2.96e+06u as=0p ps=0u
-M1042 a_1864_47# a_27_47# a_1710_329# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND a_2058_21# a_2845_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1044 a_483_47# D a_810_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_824_47# a_453_315# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_1992_47# a_27_47# a_1864_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 Q a_2845_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or2_1 A X B VPB VNB VGND VPWR
-M1000 VPWR A a_128_297# VPB phighvt w=420000u l=180000u
-+  ad=3.057e+11p pd=2.71e+06u as=9.66e+10p ps=1.3e+06u
-M1001 a_128_297# B a_38_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1002 a_38_297# B VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=3.307e+11p ps=3.43e+06u
-M1003 X a_38_297# VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
-M1004 VGND A a_38_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_38_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.5e+11p pd=2.7e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a21oi_1 A1 B1 Y A2 VPWR VGND VPB VNB
-M1000 a_121_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=5.75e+11p pd=5.15e+06u as=2.75e+11p ps=2.55e+06u
-M1001 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=4.095e+11p ps=3.86e+06u
-M1002 a_219_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=1.9175e+11p pd=1.89e+06u as=0p ps=0u
-M1003 VPWR A1 a_121_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.15e+11p pd=2.63e+06u as=0p ps=0u
-M1004 a_121_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A2 a_219_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand4_2 B A Y D C VNB VPB VGND VPWR
-M1000 VPWR D Y VPB phighvt w=1e+06u l=180000u
-+  ad=2.18e+12p pd=1.436e+07u as=1.16e+12p ps=1.032e+07u
-M1001 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=5.59e+11p pd=5.62e+06u as=2.08e+11p ps=1.94e+06u
-M1003 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_511_47# B a_297_47# VNB nshort w=650000u l=150000u
-+  ad=6.89e+11p pd=6.02e+06u as=4.485e+11p ps=3.98e+06u
-M1005 a_297_47# C a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_511_47# A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1008 Y A a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_297_47# B a_511_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND D a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_47# C a_297_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__decap_6 VPWR VGND VPB VNB
-M1000 VPWR VGND VPWR VPB phighvt w=870000u l=1.97e+06u
-+  ad=4.524e+11p pd=4.52e+06u as=0p ps=0u
-M1001 VGND VPWR VGND VNB nshort w=550000u l=1.97e+06u
-+  ad=2.86e+11p pd=3.24e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o211a_1 C1 B1 A2 A1 X VNB VPB VGND VPWR
-M1000 a_225_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=4.875e+11p pd=4.1e+06u as=4.4525e+11p ps=3.97e+06u
-M1001 a_79_21# C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=7.7e+11p pd=5.54e+06u as=1.07e+12p ps=8.14e+06u
-M1002 VPWR B1 a_79_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_540_47# B1 a_225_47# VNB nshort w=650000u l=150000u
-+  ad=3.64e+11p pd=2.42e+06u as=0p ps=0u
-M1004 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1005 a_79_21# A2 a_315_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.45e+11p ps=2.69e+06u
-M1006 a_79_21# C1 a_540_47# VNB nshort w=650000u l=150000u
-+  ad=2.275e+11p pd=2e+06u as=0p ps=0u
-M1007 a_315_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1009 VGND A1 a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and3b_2 VGND VPWR B X A_N C VNB VPB
-M1000 a_117_311# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=6.936e+11p ps=5.94e+06u
-M1001 a_317_53# a_117_311# a_225_311# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=1.218e+11p ps=1.42e+06u
-M1002 a_117_311# A_N VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=9.409e+11p ps=8.31e+06u
-M1003 a_225_311# B VPWR VPB phighvt w=420000u l=180000u
-+  ad=2.7055e+11p pd=3.05e+06u as=0p ps=0u
-M1004 VPWR C a_225_311# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_225_311# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1006 X a_225_311# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_117_311# a_225_311# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_225_311# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1009 a_411_53# B a_317_53# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1010 VGND C a_411_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_225_311# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__bufbuf_16 A X VNB VPB VGND VPWR
-M1000 X a_589_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.32e+12p pd=2.064e+07u as=4.02e+12p ps=3.604e+07u
-M1001 VGND a_589_47# X VNB nshort w=650000u l=150000u
-+  ad=2.8015e+12p pd=2.682e+07u as=1.6965e+12p ps=1.562e+07u
-M1002 X a_589_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_589_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_589_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_225_47# a_589_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.7e+11p ps=7.74e+06u
-M1006 VGND a_589_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_589_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_225_47# a_589_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_589_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_589_47# a_225_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_589_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_589_47# a_225_47# VGND VNB nshort w=650000u l=150000u
-+  ad=6.565e+11p pd=5.92e+06u as=0p ps=0u
-M1013 X a_589_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_225_47# a_589_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_589_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_589_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_589_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_589_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_589_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_117_297# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.095e+11p ps=3.86e+06u
-M1021 X a_589_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1023 VGND a_225_47# a_589_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_589_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_589_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 X a_589_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_117_297# a_225_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.6e+11p ps=5.12e+06u
-M1028 VGND a_589_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_589_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 X a_589_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_589_47# a_225_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 X a_589_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_589_47# a_225_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 X a_589_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_225_47# a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 X a_589_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_117_297# A VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1038 a_225_47# a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_225_47# a_589_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VPWR a_589_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR a_589_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR a_117_297# a_225_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND a_589_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VPWR a_589_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_589_47# a_225_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VPWR a_589_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND a_225_47# a_589_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 X a_589_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 a_589_47# a_225_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 VGND a_117_297# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 VGND a_589_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__xnor2_2 VGND VPWR Y A B VPB VNB
-M1000 a_514_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.5e+11p pd=7.7e+06u as=1.43e+12p ps=1.286e+07u
-M1001 Y a_27_297# a_600_47# VNB nshort w=650000u l=150000u
-+  ad=3.38e+11p pd=3.64e+06u as=7.4425e+11p ps=6.19e+06u
-M1002 a_27_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=5.6875e+11p pd=5.65e+06u as=7.345e+11p ps=7.46e+06u
-M1003 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND B a_600_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.65e+11p ps=7.73e+06u
-M1006 VPWR A a_514_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_47# B a_27_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.405e+11p ps=2.04e+06u
-M1008 VPWR a_27_297# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=6.15e+11p ps=5.23e+06u
-M1009 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y a_27_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A a_600_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_600_47# a_27_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_600_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y B a_514_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_297# B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_600_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_514_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__clkbuf_8 X A VPB VNB VGND VPWR
-M1000 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=7.791e+11p pd=8.75e+06u as=5.754e+11p ps=6.1e+06u
-M1001 a_118_297# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=0p ps=0u
-M1002 VGND A a_118_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.75e+12p pd=1.55e+07u as=1.2e+12p ps=1.04e+07u
-M1004 a_118_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1005 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_118_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_118_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_118_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_118_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_118_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__clkinv_8 Y A VNB VPB VGND VPWR
-M1000 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=7.014e+11p pd=7.54e+06u as=5.964e+11p ps=6.2e+06u
-M1001 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=2.095e+12p pd=1.819e+07u as=1.79e+12p ps=1.558e+07u
-M1002 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  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 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  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 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  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=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sdfxtp_4 VGND VPWR SCD D SCE CLK Q VNB VPB
-M1000 VPWR a_1189_183# a_1121_413# VPB phighvt w=420000u l=180000u
-+  ad=1.98115e+12p pd=1.754e+07u as=1.47e+11p ps=1.54e+06u
-M1001 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1002 a_608_369# D a_517_47# VNB nshort w=420000u l=150000u
-+  ad=2.604e+11p pd=2.88e+06u as=1.428e+11p ps=1.52e+06u
-M1003 a_1474_413# a_27_47# a_1189_183# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.307e+11p ps=2.19e+06u
-M1004 VPWR a_1667_315# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1005 VGND a_1667_315# a_1625_47# VNB nshort w=420000u l=150000u
-+  ad=1.48085e+12p pd=1.433e+07u as=1.32e+11p ps=1.49e+06u
-M1006 VGND a_1667_315# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.485e+11p ps=3.98e+06u
-M1007 VGND a_1189_183# a_1127_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.584e+11p ps=1.62e+06u
-M1008 a_504_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.176e+11p pd=1.96e+06u as=0p ps=0u
-M1009 a_203_47# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1010 VPWR a_1667_315# a_1568_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.121e+11p ps=1.85e+06u
-M1011 VGND a_1667_315# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR SCE a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1013 a_1121_413# a_27_47# a_1011_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.407e+11p ps=1.51e+06u
-M1014 a_1474_413# a_203_47# a_1189_183# VNB nshort w=360000u l=150000u
-+  ad=1.854e+11p pd=1.75e+06u as=1.978e+11p ps=1.99e+06u
-M1015 Q a_1667_315# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND SCE a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1017 Q a_1667_315# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_1667_315# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_1474_413# a_1667_315# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1020 a_517_47# a_319_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1127_47# a_203_47# a_1011_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.548e+11p ps=1.58e+06u
-M1022 a_1189_183# a_1011_47# VPWR VPB phighvt w=750000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Q a_1667_315# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1011_47# a_203_47# a_608_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=3.2e+11p ps=3.34e+06u
-M1025 Q a_1667_315# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_203_47# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1027 a_1625_47# a_27_47# a_1474_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR SCD a_702_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=2.144e+11p ps=1.95e+06u
-M1029 VGND SCD a_721_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=9.66e+10p ps=1.3e+06u
-M1030 VPWR a_1474_413# a_1667_315# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1031 a_702_369# a_319_47# a_608_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1189_183# a_1011_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1568_413# a_203_47# a_1474_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1011_47# a_27_47# a_608_369# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1036 a_721_47# SCE a_608_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_608_369# D a_504_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or4b_2 C A X B D_N VPWR VGND VPB VNB
-M1000 a_425_297# A VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.47e+11p pd=1.54e+06u as=7.227e+11p ps=6.17e+06u
-M1001 X a_186_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.08e+11p pd=1.94e+06u as=6.771e+11p ps=6.88e+06u
-M1002 VGND a_27_47# a_186_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.15e+11p ps=3.18e+06u
-M1003 a_186_21# a_27_47# a_615_297# VPB phighvt w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=1.428e+11p ps=1.52e+06u
-M1004 VPWR D_N a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1005 VPWR a_186_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1006 a_615_297# C a_531_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 VGND B a_186_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_531_297# B a_425_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_186_21# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND D_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1011 a_186_21# C VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_186_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_186_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a2bb2o_2 VNB VPB VGND VPWR B1 A1_N A2_N X B2
-M1000 X a_82_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=8.49e+11p ps=7.32e+06u
-M1001 a_696_47# B2 a_82_21# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=1.134e+11p ps=1.38e+06u
-M1002 a_343_47# A2_N a_341_297# VPB phighvt w=640000u l=180000u
-+  ad=1.76e+11p pd=1.83e+06u as=1.472e+11p ps=1.74e+06u
-M1003 VGND a_82_21# X VNB nshort w=650000u l=150000u
-+  ad=9.0065e+11p pd=7.95e+06u as=2.08e+11p ps=1.94e+06u
-M1004 a_622_369# B1 VPWR VPB phighvt w=640000u l=180000u
-+  ad=3.808e+11p pd=3.75e+06u as=0p ps=0u
-M1005 VGND A2_N a_343_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1006 a_343_47# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_622_369# a_343_47# a_82_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1008 a_341_297# A1_N VPWR VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B2 a_622_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_82_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_82_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B1 a_696_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_82_21# a_343_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__xor3_2 X C B A VNB VPB VGND VPWR
-M1000 VPWR A a_1050_365# VPB phighvt w=1e+06u l=180000u
-+  ad=1.2694e+12p pd=1.06e+07u as=7.234e+11p ps=5.3e+06u
-M1001 X a_81_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.275e+11p pd=2e+06u as=8.9605e+11p ps=8e+06u
-M1002 a_81_21# C a_483_49# VNB nshort w=640000u l=150000u
-+  ad=2.848e+11p pd=2.17e+06u as=5.963e+11p ps=4.53e+06u
-M1003 a_483_49# a_335_93# a_81_21# VPB phighvt w=840000u l=180000u
-+  ad=7.558e+11p pd=5.2e+06u as=3.36e+11p ps=2.48e+06u
-M1004 a_934_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.126e+11p pd=2.64e+06u as=0p ps=0u
-M1005 a_465_325# B a_1335_297# VNB nshort w=640000u l=150000u
-+  ad=6.6045e+11p pd=4.67e+06u as=5.517e+11p ps=4.37e+06u
-M1006 VGND A a_1050_365# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=4.468e+11p ps=3.98e+06u
-M1007 X a_81_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1008 a_335_93# C VGND VNB nshort w=420000u l=150000u
-+  ad=1.974e+11p pd=1.78e+06u as=0p ps=0u
-M1009 a_483_49# B a_1050_365# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1050_365# a_934_297# a_483_49# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1335_297# a_934_297# a_483_49# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_335_93# C VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.856e+11p pd=1.86e+06u as=0p ps=0u
-M1013 a_81_21# C a_465_325# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=7.824e+11p ps=5.28e+06u
-M1014 a_483_49# B a_1335_297# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=7.798e+11p ps=5.64e+06u
-M1015 a_1050_365# a_934_297# a_465_325# VNB nshort w=600000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_81_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1335_297# a_934_297# a_465_325# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_934_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=1.978e+11p pd=1.92e+06u as=0p ps=0u
-M1019 a_465_325# a_335_93# a_81_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1335_297# a_1050_365# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_465_325# B a_1050_365# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_81_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1335_297# a_1050_365# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__dlrtp_2 RESET_B D GATE Q VGND VPWR VPB VNB
-M1000 VGND a_750_21# a_708_47# VNB nshort w=420000u l=150000u
-+  ad=8.0475e+11p pd=8.18e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR GATE a_27_363# VPB phighvt w=640000u l=180000u
-+  ad=1.411e+12p pd=1.231e+07u as=1.728e+11p ps=1.82e+06u
-M1002 VPWR a_750_21# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1003 a_203_47# a_27_363# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1004 VPWR a_750_21# a_702_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1005 VGND a_750_21# Q VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1006 a_503_369# a_319_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.021e+11p pd=1.97e+06u as=0p ps=0u
-M1007 a_708_47# a_27_363# a_604_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1008 Q a_750_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Q a_750_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND D a_319_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1011 VPWR D a_319_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1012 VGND RESET_B a_981_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.6575e+11p ps=1.81e+06u
-M1013 a_604_47# a_203_47# a_500_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.482e+11p ps=1.58e+06u
-M1014 VPWR RESET_B a_750_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1015 a_981_47# a_604_47# a_750_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.69e+11p ps=1.82e+06u
-M1016 VGND GATE a_27_363# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1017 a_702_413# a_203_47# a_604_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1018 a_203_47# a_27_363# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1019 a_604_47# a_27_363# a_503_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_500_47# a_319_369# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_750_21# a_604_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__buf_2 VPWR VGND X A VPB VNB
-M1000 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=4.4425e+11p pd=4.02e+06u as=1.302e+11p ps=1.46e+06u
-M1001 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=3.0875e+11p pd=2.25e+06u as=0p ps=0u
-M1002 VPWR A a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=7.094e+11p pd=5.48e+06u as=1.728e+11p ps=1.82e+06u
-M1003 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.95e+11p pd=2.79e+06u as=0p ps=0u
-M1004 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__inv_12 A Y VNB VPB VGND VPWR
-M1000 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=1.2805e+12p pd=1.174e+07u as=1.3845e+12p ps=1.336e+07u
-M1001 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.74e+12p pd=1.548e+07u as=2e+12p ps=1.8e+07u
-M1003 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__inv_2 A Y VPB VNB VPWR VGND
-M1000 Y A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=5.4e+11p ps=5.08e+06u
-M1001 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=3.705e+11p pd=3.74e+06u as=2.08e+11p ps=1.94e+06u
-M1002 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__dlygate4sd3_1 A X VPWR VGND VPB VNB
-M1000 VPWR a_273_47# a_379_93# VPB phighvt w=420000u l=500000u
-+  ad=4.491e+11p pd=4.15e+06u as=1.092e+11p ps=1.36e+06u
-M1001 X a_379_93# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1002 VPWR A a_27_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1003 a_273_47# a_27_47# VGND VNB nshort w=420000u l=500000u
-+  ad=1.092e+11p pd=1.36e+06u as=3.636e+11p ps=3.51e+06u
-M1004 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1005 X a_379_93# VGND VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=0p ps=0u
-M1006 VGND a_273_47# a_379_93# VNB nshort w=420000u l=500000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1007 a_273_47# a_27_47# VPWR VPB phighvt w=420000u l=500000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__muxb8to1_4 VGND Z VPWR VNB VPB S[6] D[3] D[0] D[4] D[5]
-+ D[2] D[1] D[6] S[2] S[3] S[7] S[0] S[1] S[4] S[5] D[7]
-M1000 a_1313_591# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=9.4224e+12p ps=8.664e+07u
-M1001 VPWR S[0] a_142_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1002 a_3797_297# a_4239_265# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=3.8048e+12p ps=3.552e+07u
-M1003 a_405_66# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=2.2464e+12p ps=2.528e+07u
-M1004 Z a_2626_325# a_2839_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1005 a_3799_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=6.1412e+12p ps=6.128e+07u
-M1006 a_2889_66# S[4] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1007 a_1755_793# S[3] VPWR VPB phighvt w=820000u l=180000u
-+  ad=2.378e+11p pd=2.22e+06u as=0p ps=0u
-M1008 Z S[7] a_3799_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1009 Z S[5] a_2889_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1010 a_355_311# a_142_325# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1011 a_3797_591# a_4239_793# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1012 a_355_311# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND D[2] a_1315_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.618e+11p ps=8.38e+06u
-M1014 VGND D[7] a_3799_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1315_911# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1016 Z S[3] a_1315_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_355_613# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1018 VPWR S[5] a_2626_599# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1019 Z a_142_325# a_355_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1315_911# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_2839_613# a_2626_599# Z VPB phighvt w=820000u l=180000u
-+  ad=1.2606e+12p pd=1.174e+07u as=0p ps=0u
-M1022 Z S[4] a_2889_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Z a_4239_265# a_3797_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Z S[2] a_1315_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND D[7] a_3799_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_3799_911# D[7] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND D[4] a_2889_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1315_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_405_918# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=7.618e+11p pd=8.38e+06u as=0p ps=0u
-M1030 a_405_918# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Z a_1755_793# a_1313_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_4239_265# S[6] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1033 VGND D[5] a_2889_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_2889_66# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_2889_66# S[4] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1313_591# a_1755_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1315_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Z S[5] a_2889_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_2626_599# S[5] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_142_325# S[0] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 Z a_2626_599# a_2839_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR D[4] a_2839_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND S[0] a_142_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1044 Z S[2] a_1315_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_2889_66# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VPWR D[5] a_2839_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND D[3] a_1315_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_1315_911# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VPWR D[0] a_355_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 Z a_1755_265# a_1313_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=1.2606e+12p ps=1.174e+07u
-M1051 Z a_142_325# a_355_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VPWR S[1] a_142_599# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1053 Z a_4239_793# a_3797_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 a_355_613# a_142_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 VPWR D[1] a_355_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 a_2839_613# a_2626_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 a_1315_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 Z S[1] a_405_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 VGND D[1] a_405_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 VGND S[3] a_1755_793# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1061 VGND S[6] a_4239_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 a_2839_311# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 a_3799_911# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 VPWR S[6] a_4239_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1065 a_405_66# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 Z S[4] a_2889_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1067 a_142_325# S[0] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1068 a_405_918# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 VGND D[2] a_1315_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 a_2839_613# D[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1071 VPWR D[2] a_1313_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1072 VPWR S[2] a_1755_265# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1073 a_1313_297# a_1755_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1074 VGND S[5] a_2626_599# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1075 a_3797_591# a_4239_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1076 VPWR D[3] a_1313_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 a_2889_918# D[5] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1078 Z a_2626_599# a_2839_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1079 VGND D[4] a_2889_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1080 a_355_613# a_142_599# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1081 VGND D[6] a_3799_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1082 a_3797_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1083 a_405_918# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1084 a_142_599# S[1] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1085 a_4239_265# S[6] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1086 a_355_311# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1087 a_3797_591# D[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1088 a_142_599# S[1] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1089 a_3799_47# S[6] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1090 a_1313_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1091 a_3799_911# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1092 Z a_142_599# a_355_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1093 a_355_613# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1094 VGND S[2] a_1755_265# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1095 a_1313_591# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1096 Z a_4239_793# a_3797_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1097 VGND D[0] a_405_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1098 a_3799_911# D[7] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1099 a_3797_297# a_4239_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1100 a_405_66# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1101 Z S[6] a_3799_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1102 Z S[1] a_405_918# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1103 a_1755_265# S[2] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1104 a_1315_911# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1105 VPWR D[4] a_2839_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1106 VGND D[5] a_2889_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1107 a_2889_918# D[5] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1108 VPWR D[6] a_3797_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1109 Z S[0] a_405_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1110 a_2839_311# a_2626_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1111 a_3799_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1112 a_2889_918# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1113 VPWR D[5] a_2839_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1114 a_4239_793# S[7] VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1115 a_1755_265# S[2] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1116 Z a_1755_265# a_1313_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1117 VPWR D[7] a_3797_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1118 VPWR D[2] a_1313_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1119 VPWR S[7] a_4239_793# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1120 VPWR D[3] a_1313_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1121 VGND S[4] a_2626_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1122 a_3799_47# S[6] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1123 Z a_142_599# a_355_613# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1124 Z a_1755_793# a_1313_591# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1125 VPWR S[3] a_1755_793# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1126 a_1313_297# a_1755_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1127 a_2839_311# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1128 VPWR S[4] a_2626_325# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=2.378e+11p ps=2.22e+06u
-M1129 a_2626_325# S[4] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1130 a_3797_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1131 Z a_2626_325# a_2839_311# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1132 Z S[6] a_3799_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1133 Z S[0] a_405_66# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1134 a_2839_613# D[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1135 Z S[3] a_1315_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1136 VGND D[3] a_1315_911# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1137 VPWR D[0] a_355_311# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1138 VGND S[1] a_142_599# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1139 a_3797_591# D[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1140 a_1755_793# S[3] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1141 VPWR D[1] a_355_613# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1142 a_2889_918# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1143 Z a_4239_265# a_3797_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1144 Z S[7] a_3799_911# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1145 VPWR D[6] a_3797_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1146 a_2839_311# a_2626_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1147 a_355_311# a_142_325# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1148 a_4239_793# S[7] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1149 VGND S[7] a_4239_793# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1150 a_1315_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1151 VGND D[0] a_405_66# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1152 a_1313_591# a_1755_793# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1153 VPWR D[7] a_3797_591# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1154 a_2626_599# S[5] VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1155 a_2626_325# S[4] VPWR VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1156 a_405_66# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1157 VGND D[1] a_405_918# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1158 a_1313_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1159 VGND D[6] a_3799_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__mux2_8 S A1 VPWR VGND VPB VNB A0 X
-M1000 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=2.16e+12p pd=1.832e+07u as=1.16e+12p ps=1.032e+07u
-M1001 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_870_297# A0 a_79_21# VPB phighvt w=1e+06u l=180000u
-+  ad=1.385e+12p pd=6.77e+06u as=5.8e+11p ps=5.16e+06u
-M1003 a_79_21# A1 a_872_47# VNB nshort w=640000u l=150000u
-+  ad=4.096e+11p pd=3.84e+06u as=9.568e+11p ps=5.55e+06u
-M1004 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_872_47# A1 a_79_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=8.645e+11p pd=7.86e+06u as=1.5084e+12p ps=1.374e+07u
-M1007 VGND S a_872_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_1369_199# a_1422_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.0464e+12p ps=5.83e+06u
-M1012 a_79_21# A0 a_870_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_1369_199# a_1420_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.675e+12p ps=7.35e+06u
-M1014 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1420_297# a_1369_199# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1420_297# A1 a_79_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_79_21# A0 a_1422_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1369_199# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1020 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_870_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_872_47# S VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_79_21# A1 a_1420_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1422_47# a_1369_199# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1422_47# A0 a_79_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1369_199# S VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
-M1033 VPWR S a_870_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o2bb2a_4 A2_N A1_N X B2 B1 VNB VPB VGND VPWR
-M1000 a_787_47# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=3.835e+11p pd=3.78e+06u as=1.1375e+12p ps=1.13e+07u
-M1001 a_211_297# B2 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=5.8e+11p ps=5.16e+06u
-M1002 X a_211_297# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1003 X a_211_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=2.51e+12p ps=1.902e+07u
-M1004 VPWR A1_N a_455_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1005 VPWR a_455_21# a_211_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=8.19e+11p pd=7.72e+06u as=0p ps=0u
-M1007 VGND a_211_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_211_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_117_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A1_N a_787_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_211_297# a_455_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_211_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_455_21# A2_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR B1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_211_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_787_47# A2_N a_455_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.405e+11p ps=2.04e+06u
-M1017 VGND B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A2_N a_455_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_211_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_47# a_455_21# a_211_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.94e+06u
-M1022 a_211_297# a_455_21# a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_117_297# B2 a_211_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_211_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_455_21# A2_N a_787_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_455_21# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND B2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor4b_2 D_N Y C A B VNB VPB VGND VPWR
-M1000 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.3e+11p pd=7.66e+06u as=4.034e+11p ps=3.96e+06u
-M1001 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=1.1897e+12p pd=1.252e+07u as=9.295e+11p ps=8.06e+06u
-M1002 VGND D_N a_754_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1003 Y a_754_21# a_514_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=8.3e+11p ps=7.66e+06u
-M1004 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR D_N a_754_21# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1006 Y C VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_514_297# C a_305_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.8e+11p ps=5.16e+06u
-M1008 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_305_297# C a_514_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_297# B a_305_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND C Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_754_21# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_305_297# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y a_754_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_514_297# a_754_21# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a211oi_2 A2 C1 B1 Y A1 VPWR VGND VPB VNB
-M1000 VPWR A2 a_320_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.5e+11p pd=7.7e+06u as=9e+11p ps=7.8e+06u
-M1001 Y B1 VGND VNB nshort w=650000u l=150000u
-+  ad=7.085e+11p pd=6.08e+06u as=8.06e+11p ps=7.68e+06u
-M1002 a_525_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=5.265e+11p pd=5.52e+06u as=0p ps=0u
-M1003 a_320_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y C1 a_37_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=8.5e+11p ps=7.7e+06u
-M1005 a_320_297# B1 a_37_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A1 a_525_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_320_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2 a_525_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_525_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_37_297# C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_37_297# B1 a_320_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A1 a_320_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or3_4 A X B C VPB VNB VPWR VGND
-M1000 a_211_297# B a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=2.9e+11p ps=2.58e+06u
-M1001 a_27_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=1.20575e+12p ps=8.91e+06u
-M1002 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.48e+12p pd=8.96e+06u as=5.8e+11p ps=5.16e+06u
-M1003 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_117_297# C a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1006 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1007 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND C a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A a_211_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o22ai_4 A1 Y A2 B1 B2 VNB VPB VGND VPWR
-M1000 Y A2 a_123_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=1.16e+12p ps=1.032e+07u
-M1001 Y B2 a_885_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1002 a_33_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.924e+12p pd=1.762e+07u as=7.995e+11p ps=7.66e+06u
-M1003 a_885_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.49e+12p ps=1.298e+07u
-M1004 Y B1 a_33_47# VNB nshort w=650000u l=150000u
-+  ad=7.995e+11p pd=7.66e+06u as=0p ps=0u
-M1005 a_33_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_33_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_123_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_885_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_33_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B2 a_33_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_123_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A1 a_123_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y B2 a_885_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B1 a_33_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_123_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A2 a_33_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_33_47# B2 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_885_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A1 a_33_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_33_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y B2 a_33_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A2 a_123_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR B1 a_885_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_33_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_123_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A2 a_33_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_123_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_885_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_33_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR B1 a_885_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A1 a_33_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__mux2_12 VPWR VGND VPB VNB X S A1 A0
-M1000 a_119_47# S VGND VNB nshort w=650000u l=150000u
-+  ad=7.02e+11p pd=7.36e+06u as=2.9705e+12p ps=2.604e+07u
-M1001 VGND a_973_297# a_1163_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=7.02e+11p ps=7.36e+06u
-M1002 a_27_47# A1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.66e+12p pd=1.532e+07u as=1.16e+12p ps=1.032e+07u
-M1003 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=3.69e+12p pd=3.338e+07u as=1.74e+12p ps=1.548e+07u
-M1004 a_27_47# A0 a_1163_47# VNB nshort w=650000u l=150000u
-+  ad=1.287e+12p pd=1.176e+07u as=0p ps=0u
-M1005 a_117_297# a_973_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR S a_597_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.16e+12p ps=1.032e+07u
-M1007 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_597_297# A0 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1163_47# a_973_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_47# A0 a_597_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1163_47# A0 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR S a_973_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1013 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.053e+12p pd=1.104e+07u as=0p ps=0u
-M1015 a_597_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_47# A1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_597_297# A0 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND S a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_119_47# S VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_973_297# a_1163_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_117_297# A1 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_973_297# a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_47# A0 a_597_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_973_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_27_47# A1 a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_117_297# a_973_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_973_297# S VGND VNB nshort w=650000u l=150000u
-+  ad=1.755e+11p pd=1.84e+06u as=0p ps=0u
-M1039 VGND S a_973_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_119_47# A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_27_47# A0 a_1163_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR S a_597_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_1163_47# a_973_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_1163_47# A0 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_117_297# A1 a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VPWR a_973_297# a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 a_27_47# A1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 X a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 VGND S a_119_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 VGND a_27_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 a_597_297# S VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 VPWR a_27_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 a_119_47# A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 X a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__inputiso1n_1 A SLEEP_B X VGND VPWR VNB VPB
-M1000 VGND SLEEP_B a_27_53# VNB nshort w=420000u l=150000u
-+  ad=5.9745e+11p pd=4.64e+06u as=1.302e+11p ps=1.46e+06u
-M1001 VPWR A a_319_297# VPB phighvt w=420000u l=180000u
-+  ad=4.241e+11p pd=4.1e+06u as=1.218e+11p ps=1.42e+06u
-M1002 a_27_53# SLEEP_B VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1003 a_319_297# a_27_53# a_229_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1004 X a_229_297# VGND VNB nshort w=650000u l=150000u
-+  ad=1.82e+11p pd=1.86e+06u as=0p ps=0u
-M1005 VGND A a_229_297# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1006 a_229_297# a_27_53# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_229_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o21a_1 X A1 B1 A2 VPB VNB VGND VPWR
-M1000 VPWR a_83_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.255e+12p pd=6.51e+06u as=2.9e+11p ps=2.58e+06u
-M1001 a_394_297# A2 a_83_21# VPB phighvt w=1e+06u l=180000u
-+  ad=3e+11p pd=2.6e+06u as=3.6e+11p ps=2.72e+06u
-M1002 VGND a_83_21# X VNB nshort w=650000u l=150000u
-+  ad=3.835e+11p pd=3.78e+06u as=1.82e+11p ps=1.86e+06u
-M1003 a_302_47# B1 a_83_21# VNB nshort w=650000u l=150000u
-+  ad=3.445e+11p pd=3.66e+06u as=1.7225e+11p ps=1.83e+06u
-M1004 VGND A2 a_302_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_83_21# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_394_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_302_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand2b_4 B A_N Y VNB VPB VGND VPWR
-M1000 VGND B a_225_47# VNB nshort w=650000u l=150000u
-+  ad=6.175e+11p pd=5.8e+06u as=1.05625e+12p ps=9.75e+06u
-M1001 a_225_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.825e+12p pd=1.565e+07u as=1.16e+12p ps=1.032e+07u
-M1003 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_225_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1005 Y a_27_47# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A_N a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1007 VGND B a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_225_47# a_27_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_27_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A_N a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1014 Y a_27_47# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_225_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__decap_4 VGND VPWR VPB VNB
-M1000 VPWR VGND VPWR VPB phighvt w=870000u l=1.05e+06u
-+  ad=4.524e+11p pd=4.52e+06u as=0p ps=0u
-M1001 VGND VPWR VGND VNB nshort w=550000u l=1.05e+06u
-+  ad=2.86e+11p pd=3.24e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o211ai_4 A1 B1 A2 C1 Y VNB VPB VGND VPWR
-M1000 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.586e+12p pd=1.398e+07u as=8.32e+11p ps=7.76e+06u
-M1001 VPWR C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=2.48e+12p pd=1.896e+07u as=1.77e+12p ps=1.554e+07u
-M1002 Y A2 a_118_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.2e+12p ps=1.04e+07u
-M1003 VGND A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_886_47# C1 Y VNB nshort w=650000u l=150000u
-+  ad=4.225e+11p pd=3.9e+06u as=4.485e+11p ps=3.98e+06u
-M1005 Y C1 a_1088_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1006 Y B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_886_47# B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1088_47# B1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_118_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_47# B1 a_886_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_118_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A1 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A1 a_118_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_47# B1 a_1464_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.47e+11p ps=2.06e+06u
-M1019 Y C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1464_47# C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_118_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR A1 a_118_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_118_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y C1 a_886_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A2 a_118_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND A2 a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y C1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor2_1 B Y A VPB VNB VGND VPWR
-M1000 VPWR A a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=6.1e+11p pd=3.22e+06u as=2.9e+11p ps=2.58e+06u
-M1001 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=5.915e+11p pd=4.42e+06u as=1.755e+11p ps=1.84e+06u
-M1002 a_117_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1003 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nand4b_1 Y C D A_N B VPB VNB VGND VPWR
-M1000 Y B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.9e+11p pd=5.18e+06u as=1.0157e+12p ps=8.13e+06u
-M1001 VGND A_N a_40_93# VNB nshort w=420000u l=150000u
-+  ad=2.6875e+11p pd=2.18e+06u as=1.323e+11p ps=1.47e+06u
-M1002 VPWR A_N a_40_93# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1003 VPWR a_40_93# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_431_47# B a_334_47# VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=2.1775e+11p ps=1.97e+06u
-M1005 Y a_40_93# a_431_47# VNB nshort w=650000u l=150000u
-+  ad=2.925e+11p pd=2.2e+06u as=0p ps=0u
-M1006 VPWR C Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_334_47# C a_251_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.7225e+11p ps=1.83e+06u
-M1008 Y D VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_251_47# D VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__clkmux2_4 VGND VPWR S A1 A0 X VPB VNB
-M1000 VPWR a_79_199# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.3588e+12p pd=1.066e+07u as=5.8e+11p ps=5.16e+06u
-M1001 VGND a_925_21# a_754_47# VNB nshort w=420000u l=150000u
-+  ad=8.016e+11p pd=7.42e+06u as=3.591e+11p ps=2.55e+06u
-M1002 a_925_21# S VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1003 X a_79_199# VGND VNB nshort w=520000u l=150000u
-+  ad=2.808e+11p pd=3.16e+06u as=0p ps=0u
-M1004 X a_79_199# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_79_199# A1 a_525_47# VNB nshort w=420000u l=150000u
-+  ad=2.121e+11p pd=1.85e+06u as=1.428e+11p ps=1.52e+06u
-M1006 a_925_21# S VPWR VPB phighvt w=940000u l=180000u
-+  ad=2.726e+11p pd=2.46e+06u as=0p ps=0u
-M1007 a_875_309# A1 a_79_199# VPB phighvt w=940000u l=180000u
-+  ad=2.444e+11p pd=2.4e+06u as=9.447e+11p ps=3.89e+06u
-M1008 X a_79_199# VGND VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_754_47# A0 a_79_199# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_79_199# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_79_199# X VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_523_309# S VPWR VPB phighvt w=940000u l=180000u
-+  ad=3.713e+11p pd=2.67e+06u as=0p ps=0u
-M1013 a_79_199# A0 a_523_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_79_199# X VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_79_199# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_525_47# S VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_925_21# a_875_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o21ai_4 Y B1 A2 A1 VNB VPB VPWR VGND
-M1000 a_123_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.2e+12p pd=1.04e+07u as=1.2e+12p ps=1.04e+07u
-M1001 a_32_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.4625e+12p pd=1.36e+07u as=8.515e+11p ps=7.82e+06u
-M1002 a_32_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A1 a_123_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.49e+12p pd=1.298e+07u as=0p ps=0u
-M1004 a_123_297# A2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_32_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_32_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A2 a_123_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A2 a_32_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B1 a_32_47# VNB nshort w=650000u l=150000u
-+  ad=4.615e+11p pd=4.02e+06u as=0p ps=0u
-M1012 a_32_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A1 a_32_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A2 a_123_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A1 a_32_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y B1 a_32_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_32_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_32_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_123_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_123_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A1 a_123_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__clkbuf_6 A X VPB VNB VGND VPWR
-M1000 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.41e+12p pd=1.282e+07u as=8.7e+11p ps=7.74e+06u
-M1001 VPWR A a_117_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1002 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A a_117_297# VNB nshort w=420000u l=150000u
-+  ad=7.245e+11p pd=7.65e+06u as=1.134e+11p ps=1.38e+06u
-M1005 X a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=3.423e+11p pd=4.15e+06u as=0p ps=0u
-M1006 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_117_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_117_297# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_117_297# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_117_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_117_297# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_117_297# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sdfxtp_2 VPWR VGND SCE D SCD Q CLK VNB VPB
-M1000 VPWR a_1189_183# a_1121_413# VPB phighvt w=420000u l=180000u
-+  ad=1.71115e+12p pd=1.5e+07u as=1.47e+11p ps=1.54e+06u
-M1001 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1002 a_608_369# D a_517_47# VNB nshort w=420000u l=150000u
-+  ad=2.604e+11p pd=2.88e+06u as=1.428e+11p ps=1.52e+06u
-M1003 a_1474_413# a_27_47# a_1189_183# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.307e+11p ps=2.19e+06u
-M1004 VPWR a_1667_315# Q VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1005 VGND a_1667_315# Q VNB nshort w=650000u l=150000u
-+  ad=1.30535e+12p pd=1.249e+07u as=2.405e+11p ps=2.04e+06u
-M1006 VGND a_1667_315# a_1625_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.32e+11p ps=1.49e+06u
-M1007 VGND a_1189_183# a_1127_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.584e+11p ps=1.62e+06u
-M1008 a_504_369# SCE VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.176e+11p pd=1.96e+06u as=0p ps=0u
-M1009 a_203_47# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1010 VPWR a_1667_315# a_1568_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.121e+11p ps=1.85e+06u
-M1011 VPWR SCE a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1012 a_1121_413# a_27_47# a_1011_47# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.407e+11p ps=1.51e+06u
-M1013 a_1474_413# a_203_47# a_1189_183# VNB nshort w=360000u l=150000u
-+  ad=1.854e+11p pd=1.75e+06u as=1.978e+11p ps=1.99e+06u
-M1014 VGND SCE a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1015 Q a_1667_315# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_1474_413# a_1667_315# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1017 a_517_47# a_319_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1127_47# a_203_47# a_1011_47# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=1.548e+11p ps=1.58e+06u
-M1019 a_1189_183# a_1011_47# VPWR VPB phighvt w=750000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Q a_1667_315# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1011_47# a_203_47# a_608_369# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=3.2e+11p ps=3.34e+06u
-M1022 a_203_47# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1023 a_1625_47# a_27_47# a_1474_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR SCD a_702_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=2.144e+11p ps=1.95e+06u
-M1025 VGND SCD a_721_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=9.66e+10p ps=1.3e+06u
-M1026 VPWR a_1474_413# a_1667_315# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1027 a_702_369# a_319_47# a_608_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1189_183# a_1011_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1568_413# a_203_47# a_1474_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1011_47# a_27_47# a_608_369# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1032 a_721_47# SCE a_608_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_608_369# D a_504_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__einvn_8 A TE_B Z VGND VPWR VPB VNB
-M1000 VPWR TE_B a_222_309# VPB phighvt w=940000u l=180000u
-+  ad=1.4115e+12p pd=1.249e+07u as=2.5004e+12p ps=2.266e+07u
-M1001 Z A a_222_309# VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=0p ps=0u
-M1002 VPWR TE_B a_222_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Z A a_222_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_235_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.8005e+12p pd=1.724e+07u as=1.04325e+12p ps=9.71e+06u
-M1005 a_222_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_222_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_27_47# a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_235_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Z A a_235_47# VNB nshort w=650000u l=150000u
-+  ad=8.645e+11p pd=7.86e+06u as=0p ps=0u
-M1010 a_235_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_222_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR TE_B a_222_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Z A a_222_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR TE_B a_27_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1015 VGND a_27_47# a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_222_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_222_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_235_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Z A a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_235_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_235_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Z A a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Z A a_222_309# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND TE_B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.015e+11p ps=1.92e+06u
-M1025 VGND a_27_47# a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR TE_B a_222_309# VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_222_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_235_47# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND a_27_47# a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Z A a_235_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_222_309# TE_B VPWR VPB phighvt w=940000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_222_309# A Z VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_235_47# A Z VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__nor4bb_4 D_N Y A B C_N VNB VPB VGND VPWR
-M1000 Y a_207_47# a_331_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.41e+12p ps=1.282e+07u
-M1001 a_1187_297# B a_797_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.43e+12p pd=1.286e+07u as=1.16e+12p ps=1.032e+07u
-M1002 VPWR C_N a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=2.9e+11p ps=2.58e+06u
-M1003 a_207_47# D_N VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=2.223e+12p ps=1.984e+07u
-M1004 Y a_27_297# VGND VNB nshort w=650000u l=150000u
-+  ad=1.794e+12p pd=1.592e+07u as=0p ps=0u
-M1005 VGND a_27_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C_N a_27_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.1125e+11p ps=1.95e+06u
-M1007 VGND a_207_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_331_297# a_207_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_797_297# B a_1187_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_27_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_797_297# a_27_297# a_331_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y a_27_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y a_207_47# a_331_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1187_297# B a_797_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_331_297# a_27_297# a_797_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y a_207_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A a_1187_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_797_297# B a_1187_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_797_297# a_27_297# a_331_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1187_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_207_47# D_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1027 VGND a_207_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y a_207_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_331_297# a_207_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A a_1187_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1187_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND B Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND A Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_331_297# a_27_297# a_797_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o2bb2ai_1 Y A1_N A2_N B2 B1 VPB VNB VGND VPWR
-M1000 a_120_297# A1_N VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=1.275e+12p ps=8.55e+06u
-M1001 a_396_47# B1 VGND VNB nshort w=650000u l=150000u
-+  ad=4.225e+11p pd=3.9e+06u as=3.8675e+11p ps=3.79e+06u
-M1002 Y a_120_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.1e+11p pd=2.62e+06u as=0p ps=0u
-M1003 VPWR B1 a_492_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1004 a_120_297# A2_N a_122_47# VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=1.755e+11p ps=1.84e+06u
-M1005 a_396_47# a_120_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.755e+11p ps=1.84e+06u
-M1006 a_122_47# A1_N VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_492_297# B2 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A2_N a_120_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B2 a_396_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__isobufsrc_4 A X SLEEP VNB VPB VGND VPWR
-M1000 X a_459_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.45e+12p ps=1.29e+07u
-M1001 VPWR SLEEP a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=0p ps=0u
-M1002 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=1.1505e+12p pd=1.134e+07u as=8.97e+11p ps=7.96e+06u
-M1003 a_27_297# SLEEP VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_459_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_459_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR SLEEP a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND SLEEP X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_297# a_459_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A a_459_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1011 VGND A a_459_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.82e+11p ps=1.86e+06u
-M1012 a_27_297# SLEEP VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_459_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_459_21# a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X SLEEP VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_459_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_297# a_459_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__bufbuf_8 A X VNB VPB VGND VPWR
-M1000 VPWR a_338_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=2.0444e+12p pd=1.815e+07u as=1.16e+12p ps=1.032e+07u
-M1001 VGND a_338_47# X VNB nshort w=650000u l=150000u
-+  ad=1.4095e+12p pd=1.349e+07u as=8.645e+11p ps=7.86e+06u
-M1002 VPWR a_338_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_338_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_338_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_224_297# a_338_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.095e+11p ps=3.86e+06u
-M1006 X a_338_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_338_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_338_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_224_297# a_338_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.6e+11p ps=5.12e+06u
-M1010 VPWR A a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1011 a_338_47# a_224_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_224_297# a_338_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_338_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_338_47# a_224_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_338_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_338_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_224_297# a_338_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1019 VPWR a_338_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_338_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_224_297# a_27_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1022 X a_338_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_338_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_224_297# a_27_47# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1025 X a_338_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__bufinv_8 A Y VNB VPB VGND VPWR
-M1000 Y a_225_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.16e+12p pd=1.032e+07u as=1.99e+12p ps=1.798e+07u
-M1001 VPWR a_225_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND a_225_47# Y VNB nshort w=650000u l=150000u
-+  ad=1.378e+12p pd=1.334e+07u as=8.645e+11p ps=7.86e+06u
-M1003 VPWR a_225_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y a_225_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y a_225_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_225_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_117_297# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.095e+11p ps=3.86e+06u
-M1008 Y a_225_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_117_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1010 VPWR a_117_297# a_225_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.6e+11p ps=5.12e+06u
-M1011 Y a_225_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y a_225_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_225_47# a_117_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_225_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_117_297# A VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1016 a_225_47# a_117_297# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_225_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_117_297# a_225_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_225_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y a_225_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_225_47# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y a_225_47# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_117_297# a_225_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__muxb8to1_2 Z VGND VPWR VNB VPB D[2] D[1] S[7] S[6] S[5]
-+ S[4] S[3] S[2] S[1] S[0] D[7] D[6] D[5] D[4] D[3] D[0]
-M1000 VPWR D[2] a_1315_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.76e+12p pd=3.152e+07u as=8.211e+11p ps=7.41e+06u
-M1001 VPWR D[3] a_2112_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.211e+11p ps=7.41e+06u
-M1002 VPWR S[4] a_2854_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1003 a_27_297# D[0] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1004 Z a_1566_265# a_1315_297# VPB phighvt w=820000u l=180000u
-+  ad=1.9024e+12p pd=1.776e+07u as=0p ps=0u
-M1005 Z a_1989_47# a_2112_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_297# a_278_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_4565_47# S[7] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=1.9656e+12p ps=2.104e+07u
-M1008 VPWR S[0] a_278_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1009 a_1989_47# S[3] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1010 Z S[5] a_3421_69# VNB nshort w=520000u l=150000u
-+  ad=1.1232e+12p pd=1.264e+07u as=5.6745e+11p ps=5.52e+06u
-M1011 a_4709_69# D[7] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1012 a_2133_69# D[3] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1013 Z a_278_265# a_27_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_2603_297# D[4] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1015 a_845_69# S[1] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1016 a_2603_297# a_2854_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_47# S[0] Z VNB nshort w=520000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1018 Z S[1] a_845_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_47# D[0] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Z S[0] a_27_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Z S[4] a_2603_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1022 a_824_333# D[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1023 a_1989_47# S[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1024 a_3400_333# a_3277_47# Z VPB phighvt w=820000u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1025 a_3400_333# D[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_3421_69# S[5] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND D[7] a_4709_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_3277_47# S[5] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1029 a_3891_297# D[6] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1030 a_4688_333# D[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.211e+11p pd=7.41e+06u as=0p ps=0u
-M1031 VGND D[4] a_2603_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND S[4] a_2854_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1033 a_3891_297# a_4142_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR D[0] a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_701_47# S[1] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1036 VGND D[1] a_845_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR D[4] a_2603_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR D[5] a_3400_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR S[6] a_4142_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1040 a_824_333# a_701_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 Z a_2854_265# a_2603_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 Z a_3277_47# a_3400_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND S[0] a_278_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1044 a_2603_47# S[4] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_701_47# S[1] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1046 Z a_4142_265# a_3891_297# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND D[5] a_3421_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_2603_47# D[4] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VPWR D[1] a_824_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 a_3277_47# S[5] VGND VNB nshort w=520000u l=150000u
-+  ad=1.352e+11p pd=1.56e+06u as=0p ps=0u
-M1051 a_845_69# D[1] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 Z S[3] a_2133_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 VGND D[0] a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 a_3421_69# D[5] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 Z S[7] a_4709_69# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 Z a_701_47# a_824_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 a_1315_47# D[2] VGND VNB nshort w=650000u l=150000u
-+  ad=5.6745e+11p pd=5.52e+06u as=0p ps=0u
-M1058 Z S[2] a_1315_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 Z S[6] a_3891_47# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=5.6745e+11p ps=5.52e+06u
-M1060 a_1315_297# D[2] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1061 a_1315_297# a_1566_265# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 a_2112_333# a_1989_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 VGND D[2] a_1315_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 a_4688_333# a_4565_47# Z VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 a_2133_69# S[3] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 a_4565_47# S[7] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1067 VPWR S[2] a_1566_265# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1068 a_2112_333# D[3] VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 VPWR D[7] a_4688_333# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 VGND D[6] a_3891_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1071 a_4709_69# S[7] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1072 VPWR D[6] a_3891_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1073 Z a_4565_47# a_4688_333# VPB phighvt w=820000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1074 a_3891_47# S[6] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1075 VGND S[6] a_4142_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1076 a_1315_47# S[2] Z VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 VGND S[2] a_1566_265# VNB nshort w=520000u l=150000u
-+  ad=0p pd=0u as=1.352e+11p ps=1.56e+06u
-M1078 VGND D[3] a_2133_69# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1079 a_3891_47# D[6] VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__and2_1 VPWR VGND X B A VPB VNB
-M1000 a_27_75# A VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=4.4565e+11p ps=4.17e+06u
-M1001 X a_27_75# VGND VNB nshort w=650000u l=150000u
-+  ad=2.3725e+11p pd=2.03e+06u as=2.406e+11p ps=2.11e+06u
-M1002 X a_27_75# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.2e+11p pd=3.04e+06u as=0p ps=0u
-M1003 VGND B a_123_75# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1004 VPWR B a_27_75# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_123_75# A a_27_75# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
-.ends
-.subckt sky130_fd_sc_hdll__o2bb2a_2 A1_N X A2_N B2 B1 VNB VPB VGND VPWR
-M1000 a_321_369# A2_N a_313_47# VNB nshort w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=1.596e+11p ps=1.6e+06u
-M1001 a_321_369# A1_N VPWR VPB phighvt w=640000u l=180000u
-+  ad=3.652e+11p pd=2.86e+06u as=1.2558e+12p ps=9.86e+06u
-M1002 a_627_47# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.541e+11p pd=2.89e+06u as=5.4595e+11p ps=5.41e+06u
-M1003 X a_84_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.08e+11p pd=1.94e+06u as=0p ps=0u
-M1004 a_627_47# a_321_369# a_84_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1005 a_84_21# a_321_369# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.984e+11p pd=1.9e+06u as=0p ps=0u
-M1006 VPWR B1 a_723_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=2.208e+11p ps=1.97e+06u
-M1007 VPWR a_84_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1008 VPWR A2_N a_321_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_723_369# B2 a_84_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B2 a_627_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_84_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_313_47# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_84_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__sedfxbp_1 VGND VPWR SCE Q D DE SCD Q_N CLK VPB VNB
-M1000 a_1787_159# a_1611_413# VPWR VPB phighvt w=750000u l=180000u
-+  ad=2.025e+11p pd=2.04e+06u as=1.93535e+12p ps=1.705e+07u
-M1001 Q a_2266_413# VGND VNB nshort w=650000u l=150000u
-+  ad=1.9825e+11p pd=1.91e+06u as=1.4487e+12p ps=1.404e+07u
-M1002 a_211_363# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1003 a_2165_413# a_1787_159# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1004 a_2266_413# a_27_47# a_2165_413# VPB phighvt w=420000u l=180000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1005 VPWR DE a_455_324# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1006 VPWR CLK a_27_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1007 a_319_47# a_851_264# a_779_47# VNB nshort w=420000u l=150000u
-+  ad=2.478e+11p pd=2.86e+06u as=1.932e+11p ps=1.76e+06u
-M1008 a_2181_47# a_1787_159# VGND VNB nshort w=420000u l=150000u
-+  ad=1.356e+11p pd=1.51e+06u as=0p ps=0u
-M1009 Q a_2266_413# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.15e+11p pd=2.63e+06u as=0p ps=0u
-M1010 a_2266_413# a_211_363# a_2181_47# VNB nshort w=360000u l=150000u
-+  ad=1.494e+11p pd=1.55e+06u as=0p ps=0u
-M1011 a_1611_413# a_27_47# a_985_47# VNB nshort w=360000u l=150000u
-+  ad=1.404e+11p pd=1.5e+06u as=6.015e+11p ps=4.57e+06u
-M1012 a_985_47# a_955_21# a_1376_369# VPB phighvt w=640000u l=180000u
-+  ad=4.837e+11p pd=4.13e+06u as=2.24e+11p ps=1.98e+06u
-M1013 VGND SCE a_955_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1014 VGND a_2266_413# a_851_264# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1015 a_985_47# a_955_21# a_319_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Q_N a_851_264# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1017 VPWR SCE a_955_21# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.76e+11p ps=1.83e+06u
-M1018 a_409_369# D a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=1.472e+11p pd=1.74e+06u as=3.84e+11p ps=3.76e+06u
-M1019 a_985_47# SCE a_1373_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1020 VGND a_851_264# a_2391_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.32e+11p ps=1.49e+06u
-M1021 a_787_369# DE VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.432e+11p pd=2.04e+06u as=0p ps=0u
-M1022 a_319_47# a_851_264# a_787_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1611_413# a_211_363# a_985_47# VPB phighvt w=420000u l=180000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1024 VPWR a_1787_159# a_1712_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.617e+11p ps=1.61e+06u
-M1025 VPWR a_455_324# a_409_369# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_985_47# SCE a_319_47# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Q_N a_851_264# VGND VNB nshort w=650000u l=150000u
-+  ad=1.69e+11p pd=1.82e+06u as=0p ps=0u
-M1028 a_1712_413# a_27_47# a_1611_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_2266_413# a_851_264# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1030 VGND DE a_455_324# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1031 a_779_47# a_455_324# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1376_369# SCD VPWR VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND CLK a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1034 a_1373_119# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR a_851_264# a_2360_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.058e+11p ps=1.82e+06u
-M1036 VGND a_1787_159# a_1738_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.518e+11p ps=1.6e+06u
-M1037 a_211_363# a_27_47# VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1038 a_1738_47# a_211_363# a_1611_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_2391_47# a_27_47# a_2266_413# VNB nshort w=360000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_413_47# D a_319_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1041 VGND DE a_413_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_2360_413# a_211_363# a_2266_413# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_1787_159# a_1611_413# VGND VNB nshort w=640000u l=150000u
-+  ad=1.664e+11p pd=1.8e+06u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a221oi_4 A2 Y C1 A1 B2 B1 VNB VPB VPWR VGND
-M1000 a_511_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.69e+12p pd=2.338e+07u as=1.16e+12p ps=1.032e+07u
-M1001 a_503_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=1.157e+12p pd=8.76e+06u as=1.48525e+12p ps=1.367e+07u
-M1002 a_1375_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=7.67e+11p pd=7.56e+06u as=1.313e+12p ps=1.184e+07u
-M1003 Y C1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=2.01e+12p ps=1.802e+07u
-M1004 a_27_297# B1 a_511_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A2 a_511_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_1375_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A2 a_511_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1375_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_297# C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A1 a_1375_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_511_297# B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_511_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_511_297# B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B2 a_503_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y C1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1375_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_297# B2 a_511_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A1 a_511_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_503_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y B1 a_503_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_511_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y C1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A2 a_1375_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_297# B1 a_511_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_503_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_27_297# C1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_503_47# B1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_511_297# B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_511_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_511_297# B1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND C1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_27_297# B2 a_511_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR A1 a_511_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND B2 a_503_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND A2 a_1375_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Y B1 a_503_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 Y A1 a_1375_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__o22a_4 B2 B1 X A1 A2 VNB VPB VGND VPWR
-M1000 VGND A1 a_524_47# VNB nshort w=650000u l=150000u
-+  ad=9.425e+11p pd=9.4e+06u as=1.1115e+12p ps=9.92e+06u
-M1001 X a_96_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=2.055e+12p ps=1.411e+07u
-M1002 a_1006_297# A1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1003 a_614_297# B2 a_96_21# VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=5.8e+11p ps=5.16e+06u
-M1004 a_524_47# A1 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_96_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_96_21# B2 a_614_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_96_21# VGND VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=0p ps=0u
-M1008 VGND a_96_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_524_47# B1 a_96_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=3.835e+11p ps=3.78e+06u
-M1010 a_96_21# B2 a_524_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_1006_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A2 a_524_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_614_297# B1 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_96_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_96_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_524_47# B2 a_96_21# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1006_297# A2 a_96_21# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_96_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_96_21# B1 a_524_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_524_47# A2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_96_21# A2 a_1006_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_96_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR B1 a_614_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__a32oi_1 A2 Y A1 B2 B1 A3 VGND VPWR VPB VNB
-M1000 a_27_297# B1 Y VPB phighvt w=1e+06u l=180000u
-+  ad=1.02e+12p pd=8.04e+06u as=2.9e+11p ps=2.58e+06u
-M1001 Y B1 a_119_47# VNB nshort w=650000u l=150000u
-+  ad=3.445e+11p pd=2.36e+06u as=1.755e+11p ps=1.84e+06u
-M1002 Y B2 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_297# A2 VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.6e+11p ps=5.12e+06u
-M1004 a_423_47# A2 a_339_47# VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=1.755e+11p ps=1.84e+06u
-M1005 a_119_47# B2 VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.03e+11p ps=3.84e+06u
-M1006 VGND A3 a_423_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A1 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A3 a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_339_47# A1 Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__or3_2 A B X C VGND VPWR VPB VNB
-M1000 VGND a_30_53# X VNB nshort w=650000u l=150000u
-+  ad=6.469e+11p pd=5.71e+06u as=2.405e+11p ps=2.04e+06u
-M1001 a_120_297# C a_30_53# VPB phighvt w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=1.134e+11p ps=1.38e+06u
-M1002 VGND A a_30_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1003 VPWR a_30_53# X VPB phighvt w=1e+06u l=180000u
-+  ad=8.257e+11p pd=5.75e+06u as=2.9e+11p ps=2.58e+06u
-M1004 a_30_53# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_30_53# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_202_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.47e+11p ps=1.54e+06u
-M1007 X a_30_53# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND C a_30_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_202_297# B a_120_297# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-.ends
-.subckt sky130_fd_sc_hdll__tap VPWR VGND
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+.subckt sky130_fd_sc_hdll__tap VGND VPWR
 Xsky130_fd_sc_hdll__o22ai_2_0 sky130_fd_sc_hdll__o22ai_2_0/B2 sky130_fd_sc_hdll__o22ai_2_0/B1
 + sky130_fd_sc_hdll__o22ai_2_0/Y sky130_fd_sc_hdll__o22ai_2_0/A1 sky130_fd_sc_hdll__o22ai_2_0/A2
 + VPWR VGND VGND VPWR sky130_fd_sc_hdll__o22ai_2
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.cdl b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.cdl
index 61b08fc..2c52b19 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.cdl
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__xnor2_1 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A VPB 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
-MMPnand1 inand B 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
-MMPaoi10 VPWR A 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
-MMPaoi11 sndPA B 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
-MMPaoi20 Y inand 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
+MMNnand0 VGND A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand1 sndNA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 nmid A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 nmid B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 Y inand VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xnor2_1
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.netlist.tsv b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.netlist.tsv
index 33e12d9..9ae2d9f 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.netlist.tsv
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	inand	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	A	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPA	B	Y	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	inand	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.spice b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.spice
index 6139d34..7a38d07 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.spice
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__xnor2_1 A B VGND VNB VPB VPWR Y
-M1000 Y B a_415_297# VPB phighvt w=1e+06u l=180000u
-+  ad=3.5e+11p pd=2.7e+06u as=2.3e+11p ps=2.46e+06u
-M1001 a_415_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.48e+12p ps=8.96e+06u
-M1002 a_139_47# B a_47_47# VNB nshort w=650000u l=150000u
-+  ad=1.365e+11p pd=1.72e+06u as=2.015e+11p ps=1.92e+06u
-M1003 VPWR A a_47_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1004 a_315_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=3.77e+11p pd=3.76e+06u as=4.42e+11p ps=3.96e+06u
-M1005 Y a_47_47# a_315_47# VNB nshort w=650000u l=150000u
-+  ad=1.95e+11p pd=1.9e+06u as=0p ps=0u
-M1006 a_315_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A a_139_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_47_47# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_47_47# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_47_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_47_47# B a_139_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X2 VGND B a_315_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR A a_415_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 VGND A a_315_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_47_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_415_297# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 VPWR B a_47_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_315_47# a_47_47# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_139_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.cdl b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.cdl
index 6379354..450053f 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.cdl
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__xnor2_2 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPA B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand VPB phighvt m=2 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand1 sndNA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 nmid A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 nmid B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 Y inand VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xnor2_2
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.netlist.tsv b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.netlist.tsv
index 4e8b6b8..c8bdb9d 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.netlist.tsv
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	inand	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	A	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	B	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPA	B	Y	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	inand	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	A	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	2	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	B	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.spice b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.spice
index 3e9d277..7abfa5d 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.spice
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__xnor2_2 A B VGND VNB VPB VPWR Y
-M1000 a_514_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=8.5e+11p pd=7.7e+06u as=1.43e+12p ps=1.286e+07u
-M1001 Y a_27_297# a_600_47# VNB nshort w=650000u l=150000u
-+  ad=3.38e+11p pd=3.64e+06u as=7.4425e+11p ps=6.19e+06u
-M1002 a_27_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=5.6875e+11p pd=5.65e+06u as=7.345e+11p ps=7.46e+06u
-M1003 VGND A a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND B a_600_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.65e+11p ps=7.73e+06u
-M1006 VPWR A a_514_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_47# B a_27_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=2.405e+11p ps=2.04e+06u
-M1008 VPWR a_27_297# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=6.15e+11p ps=5.23e+06u
-M1009 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y a_27_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A a_600_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_600_47# a_27_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_600_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y B a_514_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_297# B a_27_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_600_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_514_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_514_297# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 Y a_27_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X3 VGND A a_600_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 VPWR A a_514_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 VPWR a_27_297# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 Y a_27_297# a_600_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_27_297# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 Y B a_514_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_27_297# B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VGND B a_600_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_514_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_600_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_600_47# a_27_297# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 a_27_47# B a_27_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_600_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VGND A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 VPWR B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.cdl b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.cdl
index 19b4498..06bdf88 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.cdl
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__xnor2_4 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA B VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand B VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPA B VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand VPB phighvt m=4 w=1.0 l=0.18 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=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand1 sndNA B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 nmid A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 nmid B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 Y inand VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPA B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xnor2_4
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.netlist.tsv b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.netlist.tsv
index 1071153..0381b1b 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.netlist.tsv
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	inand	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	A	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	B	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPA	B	Y	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	inand	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	A	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	B	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.spice b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.spice
index 7df63ae..dcb2d71 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.spice
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_hdll__xnor2_4 A B VGND VNB VPB VPWR Y
-M1000 VPWR A a_898_297# VPB phighvt w=1e+06u l=180000u
-+  ad=2.32e+12p pd=2.064e+07u as=1.41e+12p ps=1.282e+07u
-M1001 Y a_38_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.41e+12p pd=1.282e+07u as=0p ps=0u
-M1002 VGND B a_980_47# VNB nshort w=650000u l=150000u
-+  ad=1.378e+12p pd=1.334e+07u as=1.443e+12p ps=1.354e+07u
-M1003 a_980_47# a_38_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.485e+11p ps=3.98e+06u
-M1004 VGND A a_980_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_38_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.43e+12p pd=1.286e+07u as=0p ps=0u
-M1006 Y B a_898_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_38_297# B a_38_47# VNB nshort w=650000u l=150000u
-+  ad=4.485e+11p pd=3.98e+06u as=9.425e+11p ps=9.4e+06u
-M1008 VPWR a_38_297# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_38_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_980_47# a_38_297# Y VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_980_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B a_38_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_898_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y a_38_297# a_980_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_38_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_38_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_38_297# Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A a_898_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_38_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_898_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_38_47# B a_38_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_980_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND B a_980_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y a_38_297# a_980_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A a_980_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_898_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_38_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y B a_898_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y a_38_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND A a_38_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_38_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND A a_38_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_980_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR B a_38_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR A a_38_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_898_297# B Y VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_38_297# B a_38_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_38_47# B a_38_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_980_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B a_898_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 VPWR a_38_297# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VGND A a_38_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 VPWR B a_38_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_898_297# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 Y a_38_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND A a_38_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 VGND A a_980_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 Y a_38_297# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_898_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 VGND A a_980_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 VGND B a_980_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_38_297# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 VPWR A a_898_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_38_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_38_47# B a_38_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VPWR B a_38_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_980_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X18 VGND B a_980_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 Y B a_898_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 a_980_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 Y a_38_297# a_980_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 a_38_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 a_898_297# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 Y a_38_297# a_980_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 VPWR A a_38_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X26 a_980_47# a_38_297# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 a_980_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X28 a_38_297# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X29 a_38_297# B a_38_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 a_38_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 VPWR A a_898_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 a_38_297# B a_38_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X33 a_980_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X34 a_38_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 a_898_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X36 a_38_47# B a_38_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X37 VPWR a_38_297# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X38 VPWR A a_38_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X39 a_980_47# a_38_297# Y VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.cdl b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.cdl
index 9e2734e..0c8cda3 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.cdl
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hdll__xnor3_1 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN3 X net57 VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X net57 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 Ab Bb VNB nshort m=1 w=0.6 l=0.15 mult=1 sa=0.265 sb=0.265
+MI29 Ab Bb VNB nfet_01v8 m=1 w=0.6 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 Bb B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 mid1 Cb VNB 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.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X net57 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 mid1 C VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 mid2 B VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 mid1 B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 mid2 Bb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 mid2 Cb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 Cb C VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 C VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI45 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI16 Bb B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab 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
-MI23 mid1 B VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 mid2 Cb VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB 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
-MI16 Bb B 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
-MI19 mid1 Bb VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 mid1 Bb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xnor3_1
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.netlist.tsv b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.netlist.tsv
index acbd4b2..50a1f97 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.netlist.tsv
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	Ab	Bb	mid2	VNB	nshort	1	0.6	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.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	C	net57	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	mid2	Cb	net57	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net57	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	Ab	Bb	mid2	VNB	nfet_01v8	1	0.6	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.65	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.0	0.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.spice b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.spice
index 3506ac3..bb7ca38 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.spice
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_hdll__xnor3_1 A B C VGND VNB VPB VPWR X
-M1000 VPWR a_83_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.22595e+12p pd=8.52e+06u as=2.9e+11p ps=2.58e+06u
-M1001 a_901_297# a_783_297# a_375_49# VNB nshort w=600000u l=150000u
-+  ad=4.4975e+11p pd=3.99e+06u as=5.4545e+11p ps=4.31e+06u
-M1002 a_83_21# C a_375_49# VNB nshort w=640000u l=150000u
-+  ad=2.176e+11p pd=1.96e+06u as=0p ps=0u
-M1003 a_1184_297# a_901_297# VGND VNB nshort w=640000u l=150000u
-+  ad=5.677e+11p pd=4.42e+06u as=9.124e+11p ps=6.76e+06u
-M1004 a_783_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.2e+11p pd=2.64e+06u as=0p ps=0u
-M1005 a_901_297# a_783_297# a_351_325# VPB phighvt w=840000u l=180000u
-+  ad=7.226e+11p pd=5.29e+06u as=5.878e+11p ps=4.8e+06u
-M1006 a_351_325# B a_901_297# VNB nshort w=640000u l=150000u
-+  ad=6.091e+11p pd=4.57e+06u as=0p ps=0u
-M1007 a_1184_297# a_901_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=7.998e+11p pd=5.68e+06u as=0p ps=0u
-M1008 a_783_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=1.6515e+11p pd=1.82e+06u as=0p ps=0u
-M1009 VGND A a_901_297# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_375_49# B a_901_297# VPB phighvt w=840000u l=180000u
-+  ad=8.3175e+11p pd=5.4e+06u as=0p ps=0u
-M1011 a_351_325# B a_1184_297# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_83_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.82e+11p ps=1.86e+06u
-M1013 a_351_325# a_226_93# a_83_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A a_901_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_83_21# C a_351_325# VPB phighvt w=840000u l=180000u
-+  ad=3.227e+11p pd=2.67e+06u as=0p ps=0u
-M1016 a_1184_297# a_783_297# a_351_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_226_93# C VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.856e+11p pd=1.86e+06u as=0p ps=0u
-M1018 a_1184_297# a_783_297# a_375_49# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_375_49# B a_1184_297# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_226_93# C VGND VNB nshort w=420000u l=150000u
-+  ad=1.995e+11p pd=1.79e+06u as=0p ps=0u
-M1021 a_375_49# a_226_93# a_83_21# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND C a_226_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND a_901_297# a_1184_297# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_1184_297# B a_351_325# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X3 a_901_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_901_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_351_325# a_783_297# a_901_297# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X6 a_351_325# a_783_297# a_1184_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 X a_83_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VGND B a_783_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VPWR a_901_297# a_1184_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X10 X a_83_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VPWR C a_226_93# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X12 a_901_297# B a_375_49# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X13 a_375_49# C a_83_21# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 a_375_49# a_783_297# a_1184_297# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X15 a_1184_297# B a_375_49# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 a_83_21# a_226_93# a_351_325# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 a_351_325# C a_83_21# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X18 a_83_21# a_226_93# a_375_49# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X19 VPWR B a_783_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 a_901_297# B a_351_325# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 a_375_49# a_783_297# a_901_297# VNB sky130_fd_pr__nfet_01v8 w=600000u l=150000u
 .ends
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.cdl b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.cdl
index 5730640..b9e518a 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.cdl
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hdll__xnor3_2 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN3 X net57 VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X net57 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 Ab Bb VNB nshort m=1 w=0.6 l=0.15 mult=1 sa=0.265 sb=0.265
+MI29 Ab Bb VNB nfet_01v8 m=1 w=0.6 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 Bb B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 mid1 Cb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 mid1 Cb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI44 Ab A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 Cb C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI2 mid2 C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 Abb Ab VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 Ab B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI28 Abb B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X net57 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X net57 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 mid1 C VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 mid2 B VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 mid1 B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 mid2 Bb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 mid2 Cb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 Cb C VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 C VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI45 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI16 Bb B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab 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
-MI23 mid1 B VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 mid2 Cb VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB 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
-MI16 Bb B 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
-MI19 mid1 Bb VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 mid1 Bb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xnor3_2
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.netlist.tsv b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.netlist.tsv
index 1bb1c3c..be12608 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.netlist.tsv
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_hdll__xnor3_2	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN3	MOSFET	X	net57	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	Ab	Bb	mid2	VNB	nshort	1	0.6	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	mid1	Cb	net57	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	Cb	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	mid2	C	net57	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Ab	B	mid1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	Abb	B	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	net57	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	C	net57	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	mid2	Cb	net57	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net57	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	Ab	Bb	mid2	VNB	nfet_01v8	1	0.6	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	mid1	Cb	net57	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	Cb	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	mid2	C	net57	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Ab	B	mid1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	Abb	B	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	net57	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.spice b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.spice
index 587ac12..ac6192b 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.spice
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__xnor3_2 A B C VGND VNB VPB VPWR X
-M1000 a_477_49# a_328_93# a_79_21# VPB phighvt w=840000u l=180000u
-+  ad=8.3175e+11p pd=5.4e+06u as=3.227e+11p ps=2.67e+06u
-M1001 a_1286_297# a_885_297# a_453_325# VNB nshort w=420000u l=150000u
-+  ad=7.149e+11p pd=4.88e+06u as=6.411e+11p ps=4.67e+06u
-M1002 VGND a_79_21# X VNB nshort w=650000u l=150000u
-+  ad=8.543e+11p pd=7.87e+06u as=2.405e+11p ps=2.04e+06u
-M1003 a_328_93# C VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.856e+11p pd=1.86e+06u as=1.22095e+12p ps=1.051e+07u
-M1004 a_477_49# B a_1286_297# VNB nshort w=640000u l=150000u
-+  ad=5.4545e+11p pd=4.31e+06u as=0p ps=0u
-M1005 a_885_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.2e+11p pd=2.64e+06u as=0p ps=0u
-M1006 a_453_325# B a_1286_297# VPB phighvt w=640000u l=180000u
-+  ad=6.39e+11p pd=4.96e+06u as=9.286e+11p ps=5.88e+06u
-M1007 a_79_21# C a_477_49# VNB nshort w=640000u l=150000u
-+  ad=1.856e+11p pd=1.86e+06u as=0p ps=0u
-M1008 a_453_325# a_328_93# a_79_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_328_93# C VGND VNB nshort w=420000u l=150000u
-+  ad=1.995e+11p pd=1.79e+06u as=0p ps=0u
-M1010 a_477_49# B a_1003_297# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=7.226e+11p ps=5.29e+06u
-M1011 a_1286_297# a_1003_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1003_297# a_885_297# a_477_49# VNB nshort w=600000u l=150000u
-+  ad=4.4975e+11p pd=3.99e+06u as=0p ps=0u
-M1013 X a_79_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.1e+11p pd=2.62e+06u as=0p ps=0u
-M1014 a_1003_297# a_885_297# a_453_325# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_453_325# B a_1003_297# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_79_21# C a_453_325# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1286_297# a_885_297# a_477_49# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A a_1003_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_79_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1286_297# a_1003_297# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A a_1003_297# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_885_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=1.6515e+11p pd=1.82e+06u as=0p ps=0u
-M1023 X a_79_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_477_49# a_885_297# a_1003_297# VNB sky130_fd_pr__nfet_01v8 w=600000u l=150000u
+X1 a_79_21# a_328_93# a_453_325# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_1286_297# B a_453_325# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X3 a_79_21# a_328_93# a_477_49# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X4 VGND C a_328_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_477_49# a_885_297# a_1286_297# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X6 a_1003_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 VPWR a_79_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR B a_885_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 X a_79_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_477_49# C a_79_21# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_453_325# a_885_297# a_1286_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_453_325# C a_79_21# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X13 VPWR a_1003_297# a_1286_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_1003_297# B a_477_49# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X15 a_1003_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VPWR C a_328_93# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X17 a_1003_297# B a_453_325# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_453_325# a_885_297# a_1003_297# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X19 VGND a_79_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X20 a_1286_297# B a_477_49# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 VGND B a_885_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 VGND a_1003_297# a_1286_297# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 X a_79_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.cdl b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.cdl
index 621dbfc..b33eec5 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.cdl
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hdll__xnor3_4 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN3 X net57 VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X net57 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 Ab Bb VNB nshort m=1 w=0.6 l=0.15 mult=1 sa=0.265 sb=0.265
+MI29 Ab Bb VNB nfet_01v8 m=1 w=0.6 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 Bb B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 mid1 Cb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 mid1 Cb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI44 Ab A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 Cb C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI2 mid2 C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 Abb Ab VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 Ab B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI28 Abb B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X net57 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X net57 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 mid1 C VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 mid2 B VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 mid1 B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 mid2 Bb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 mid2 Cb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 Cb C VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 C VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI45 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI16 Bb B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab 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
-MI23 mid1 B VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 mid2 Cb VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB 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
-MI16 Bb B 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
-MI19 mid1 Bb VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 mid1 Bb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xnor3_4
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.netlist.tsv b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.netlist.tsv
index a32165f..0f5c13e 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.netlist.tsv
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_hdll__xnor3_4	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN3	MOSFET	X	net57	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	Ab	Bb	mid2	VNB	nshort	1	0.6	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	mid1	Cb	net57	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	Cb	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	mid2	C	net57	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Ab	B	mid1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	Abb	B	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	net57	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	C	net57	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	mid2	Cb	net57	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net57	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	Ab	Bb	mid2	VNB	nfet_01v8	1	0.6	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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	mid1	Cb	net57	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	Cb	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	mid2	C	net57	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Ab	B	mid1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	Abb	B	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	net57	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.spice b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.spice
index ae687e2..e49f049 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.spice
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_hdll__xnor3_4 A B C VGND VNB VPB VPWR X
-M1000 X a_101_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=1.50095e+12p ps=1.307e+07u
-M1001 a_1490_297# a_1207_297# VGND VNB nshort w=640000u l=150000u
-+  ad=5.677e+11p pd=4.42e+06u as=1.0748e+12p ps=9.85e+06u
-M1002 a_532_93# C VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.856e+11p pd=1.86e+06u as=0p ps=0u
-M1003 VGND A a_1207_297# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=4.44e+11p ps=3.96e+06u
-M1004 a_1089_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=2.015e+11p pd=1.92e+06u as=0p ps=0u
-M1005 VGND a_101_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.88e+06u
-M1006 a_657_325# B a_1207_297# VNB nshort w=640000u l=150000u
-+  ad=5.835e+11p pd=4.49e+06u as=0p ps=0u
-M1007 VGND a_101_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_681_49# B a_1207_297# VPB phighvt w=840000u l=180000u
-+  ad=8.3175e+11p pd=5.4e+06u as=7.226e+11p ps=5.29e+06u
-M1009 X a_101_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1207_297# a_1089_297# a_657_325# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=5.878e+11p ps=4.8e+06u
-M1011 a_1490_297# a_1089_297# a_657_325# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_101_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1490_297# a_1207_297# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=7.998e+11p pd=5.68e+06u as=0p ps=0u
-M1014 a_681_49# B a_1490_297# VNB nshort w=640000u l=150000u
-+  ad=5.4845e+11p pd=4.32e+06u as=0p ps=0u
-M1015 a_1207_297# a_1089_297# a_681_49# VNB nshort w=600000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_657_325# B a_1490_297# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_101_21# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A a_1207_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_101_21# C a_657_325# VPB phighvt w=840000u l=180000u
-+  ad=3.227e+11p pd=2.67e+06u as=0p ps=0u
-M1020 a_657_325# a_532_93# a_101_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.432e+11p ps=2.04e+06u
-M1021 a_1490_297# a_1089_297# a_681_49# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_101_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_101_21# C a_681_49# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_101_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_681_49# a_532_93# a_101_21# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_532_93# C VGND VNB nshort w=420000u l=150000u
-+  ad=1.995e+11p pd=1.79e+06u as=0p ps=0u
-M1027 a_1089_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.2e+11p pd=2.64e+06u as=0p ps=0u
+X0 a_1207_297# B a_657_325# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_101_21# a_532_93# a_681_49# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X2 a_657_325# C a_101_21# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X3 a_1490_297# B a_657_325# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X4 X a_101_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 VPWR a_1207_297# a_1490_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 a_1207_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_101_21# a_532_93# a_657_325# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 VGND B a_1089_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VPWR C a_532_93# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X10 VPWR a_101_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_657_325# a_1089_297# a_1490_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 X a_101_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_1207_297# B a_681_49# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X14 VGND a_101_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VGND a_101_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_1207_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_681_49# C a_101_21# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_657_325# a_1089_297# a_1207_297# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X19 X a_101_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 X a_101_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 VGND C a_532_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 VPWR a_101_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X23 a_681_49# a_1089_297# a_1207_297# VNB sky130_fd_pr__nfet_01v8 w=600000u l=150000u
+X24 a_1490_297# B a_681_49# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 a_681_49# a_1089_297# a_1490_297# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X26 VGND a_1207_297# a_1490_297# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X27 VPWR B a_1089_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_1.cdl b/cells/xor2/sky130_fd_sc_hdll__xor2_1.cdl
index 767d150..e6da1ad 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_1.cdl
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__xor2_1 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNnor0 inor A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND A VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNA B VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 X inor VNB nshort m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A VPB 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
-MMPnor1 sndPA B 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
-MMPaoi10 pmid A 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
-MMPaoi11 pmid B 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
-MMPaoi20 X inor 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
+MMNnor0 inor A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnor1 inor B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 VGND A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 sndNA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 X inor VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 X inor VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xor2_1
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_1.netlist.tsv b/cells/xor2/sky130_fd_sc_hdll__xor2_1.netlist.tsv
index 0220aac..27fa3bc 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_1.netlist.tsv
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	B	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNA	B	X	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	X	inor	VGND	VNB	nshort	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA	B	inor	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	A	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	X	inor	pmid	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	B	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNA	B	X	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	X	inor	VGND	VNB	nfet_01v8	1	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA	B	inor	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	X	inor	pmid	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_1.spice b/cells/xor2/sky130_fd_sc_hdll__xor2_1.spice
index ecba694..6068f71 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_1.spice
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hdll__xor2_1 A B VGND VNB VPB VPWR X
-M1000 VPWR A a_125_297# VPB phighvt w=1e+06u l=180000u
-+  ad=5.6e+11p pd=5.12e+06u as=3e+11p ps=2.6e+06u
-M1001 X a_35_297# a_315_297# VPB phighvt w=1e+06u l=180000u
-+  ad=4.5e+11p pd=2.9e+06u as=5.7e+11p ps=5.14e+06u
-M1002 a_35_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=1.82e+11p pd=1.86e+06u as=7.28e+11p ps=6.14e+06u
-M1003 VGND A a_35_297# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_35_297# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=5.46e+11p ps=2.98e+06u
-M1005 VPWR B a_315_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_125_297# B a_35_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1007 a_317_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=2.145e+11p pd=1.96e+06u as=0p ps=0u
-M1008 X B a_317_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_315_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_315_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_315_297# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_35_297# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_125_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_315_297# a_35_297# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_35_297# B a_125_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 X a_35_297# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_317_47# B X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VGND A a_317_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 VGND B a_35_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_2.cdl b/cells/xor2/sky130_fd_sc_hdll__xor2_2.cdl
index 218deeb..512711d 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_2.cdl
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__xor2_2 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNnor0 inor A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND A VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNA B VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 X inor VNB nshort m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid A VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 X inor VPB phighvt m=2 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnor1 inor B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 VGND A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 sndNA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 X inor VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 X inor VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xor2_2
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_2.netlist.tsv b/cells/xor2/sky130_fd_sc_hdll__xor2_2.netlist.tsv
index 4eb294a..ebd47ba 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_2.netlist.tsv
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	B	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNA	B	X	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	X	inor	VGND	VNB	nshort	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A	sndPA	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA	B	inor	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	A	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	X	inor	pmid	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	B	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNA	B	X	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	X	inor	VGND	VNB	nfet_01v8	2	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA	B	inor	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	A	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	X	inor	pmid	VPB	pfet_01v8_hvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_2.spice b/cells/xor2/sky130_fd_sc_hdll__xor2_2.spice
index 8fdd987..5d47266 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_2.spice
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hdll__xor2_2 A B VGND VNB VPB VPWR X
-M1000 X B a_510_47# VNB nshort w=650000u l=150000u
-+  ad=5.1675e+11p pd=4.19e+06u as=5.785e+11p ps=5.68e+06u
-M1001 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=9.25e+11p pd=7.85e+06u as=8.45e+11p ps=7.69e+06u
-M1002 VGND A a_112_47# VNB nshort w=650000u l=150000u
-+  ad=1.06925e+12p pd=1.109e+07u as=4.485e+11p ps=3.98e+06u
-M1003 VGND A a_510_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_510_47# B X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_510_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=1.39e+12p pd=1.278e+07u as=0p ps=0u
-M1006 a_27_297# B a_112_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1007 a_510_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_112_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_112_47# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR B a_510_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_510_297# a_112_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1012 X a_112_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_112_47# a_510_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_112_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND B a_112_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_112_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_510_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_510_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_112_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 VGND A a_510_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_510_297# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_112_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_112_47# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VPWR A a_510_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X7 a_510_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X8 VGND a_112_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_112_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 X a_112_47# a_510_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 VGND A a_112_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 a_510_47# B X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 X B a_510_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X14 a_27_297# B a_112_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 a_510_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 VGND B a_112_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VPWR B a_510_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X19 a_510_297# a_112_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_4.cdl b/cells/xor2/sky130_fd_sc_hdll__xor2_4.cdl
index 595c170..17cac13 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_4.cdl
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__xor2_4 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNnor0 inor A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor B VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND A VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNA B VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 X inor VNB nshort m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA B VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid A VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 X inor VPB phighvt m=4 w=1.0 l=0.18 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.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnor1 inor B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 VGND A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 sndNA B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 X inor VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 X inor VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xor2_4
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_4.netlist.tsv b/cells/xor2/sky130_fd_sc_hdll__xor2_4.netlist.tsv
index 65096d5..c24af23 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_4.netlist.tsv
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hdll__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.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	B	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNA	B	X	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	X	inor	VGND	VNB	nshort	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A	sndPA	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA	B	inor	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	A	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	X	inor	pmid	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	B	VGND	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNA	B	X	VNB	nfet_01v8	4	0.65	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	X	inor	VGND	VNB	nfet_01v8	4	0.65	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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA	B	inor	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	A	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	X	inor	pmid	VPB	pfet_01v8_hvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_4.spice b/cells/xor2/sky130_fd_sc_hdll__xor2_4.spice
index 2f64fbc..07d4a7b 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_4.spice
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_hdll__xor2_4 A B VGND VNB VPB VPWR X
-M1000 a_27_297# B a_112_47# VPB phighvt w=1e+06u l=180000u
-+  ad=1.425e+12p pd=1.285e+07u as=5.8e+11p ps=5.16e+06u
-M1001 VPWR A a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=1.74e+12p pd=1.548e+07u as=1.9868e+12p ps=1.798e+07u
-M1002 X B a_886_47# VNB nshort w=650000u l=150000u
-+  ad=8.97e+11p pd=7.96e+06u as=9.295e+11p ps=9.36e+06u
-M1003 a_112_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=8.645e+11p pd=7.86e+06u as=1.97925e+12p ps=1.909e+07u
-M1004 a_886_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_112_47# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_886_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A a_886_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_112_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B a_112_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A a_112_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_886_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_886_297# a_112_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.6245e+11p ps=7.74e+06u
-M1017 X B a_886_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_886_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_112_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_886_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_886_47# B X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_297# B a_112_47# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_112_47# a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_112_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND B a_112_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_27_297# A VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR B a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 X a_112_47# a_886_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_112_47# A VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A a_112_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND A a_886_47# VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_112_47# B a_27_297# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_886_297# a_112_47# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_886_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 X a_112_47# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_886_47# B X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND a_112_47# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_112_47# B VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_886_297# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_886_297# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_112_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X3 a_886_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X4 X a_112_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X5 a_112_47# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X6 VGND A a_112_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X7 a_886_297# a_112_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 X B a_886_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X9 a_886_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X10 a_886_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X11 a_886_47# B X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X12 X B a_886_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X13 VPWR A a_886_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X14 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X15 VPWR B a_886_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X16 X a_112_47# a_886_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 a_27_297# B a_112_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 VGND B a_112_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X19 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VPWR A a_886_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 a_112_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X22 VGND B a_112_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 a_886_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X24 VGND a_112_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X25 a_112_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X26 VGND A a_886_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X27 a_112_47# B a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X28 VGND A a_112_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X29 VGND A a_886_47# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X30 X a_112_47# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X31 a_27_297# B a_112_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X32 a_886_297# a_112_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X33 VGND a_112_47# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X34 X a_112_47# a_886_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X35 a_27_297# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X36 a_112_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X37 a_886_47# B X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X38 VPWR A a_27_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X39 VPWR B a_886_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_1.cdl b/cells/xor3/sky130_fd_sc_hdll__xor3_1.cdl
index 6499014..ccd695c 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_1.cdl
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hdll__xor3_1 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP3 X net117 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X net117 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 mid1 Cb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI1 mid2 C VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 Cb C VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 Cb VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI45 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 mid2 C VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 mid1 Bb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 Bb B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI23 mid1 B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 mid2 Bb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 mid2 B VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X net117 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ 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.18 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.18 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.18 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.0 l=0.18 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.18 mult=1 sa=0.265 sb=0.265
+MI17 Bb B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB phighvt m=1 w=0.64 l=0.18 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.18 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.65 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nshort m=1 w=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.6 l=0.15 mult=1 sa=0.265 sb=0.265
+MI29 Ab Bb VNB nfet_01v8 m=1 w=0.6 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xor3_1
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_1.netlist.tsv b/cells/xor3/sky130_fd_sc_hdll__xor3_1.netlist.tsv
index ec27242..ca23bb1 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_1.netlist.tsv
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_hdll__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.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	Cb	net117	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	mid2	C	net117	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	net117	VGND	VNB	nshort	1	0.65	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.65	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.6	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.0	0.18	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.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net117	VGND	VNB	nfet_01v8	1	0.65	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.65	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.6	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_1.spice b/cells/xor3/sky130_fd_sc_hdll__xor3_1.spice
index 61ef41a..7edc953 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_1.spice
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_hdll__xor3_1 A B C VGND VNB VPB VPWR X
-M1000 VGND A a_991_365# VNB nshort w=640000u l=150000u
-+  ad=9.7095e+11p pd=6.94e+06u as=4.498e+11p ps=3.99e+06u
-M1001 a_276_93# C VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.856e+11p pd=1.86e+06u as=1.3094e+12p ps=8.68e+06u
-M1002 a_276_93# C VGND VNB nshort w=420000u l=150000u
-+  ad=1.974e+11p pd=1.78e+06u as=0p ps=0u
-M1003 a_875_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=1.653e+11p pd=1.82e+06u as=0p ps=0u
-M1004 a_424_49# B a_991_365# VNB nshort w=640000u l=150000u
-+  ad=5.931e+11p pd=4.52e+06u as=0p ps=0u
-M1005 a_116_21# C a_406_325# VPB phighvt w=840000u l=180000u
-+  ad=3.36e+11p pd=2.48e+06u as=7.824e+11p ps=5.28e+06u
-M1006 a_875_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.126e+11p pd=2.64e+06u as=0p ps=0u
-M1007 a_116_21# C a_424_49# VNB nshort w=640000u l=150000u
-+  ad=2.88e+11p pd=2.18e+06u as=0p ps=0u
-M1008 a_1276_297# a_875_297# a_424_49# VNB nshort w=420000u l=150000u
-+  ad=5.677e+11p pd=4.42e+06u as=0p ps=0u
-M1009 a_406_325# B a_1276_297# VNB nshort w=640000u l=150000u
-+  ad=6.5745e+11p pd=4.66e+06u as=0p ps=0u
-M1010 a_991_365# a_875_297# a_424_49# VPB phighvt w=840000u l=180000u
-+  ad=7.234e+11p pd=5.3e+06u as=7.558e+11p ps=5.2e+06u
-M1011 a_406_325# B a_991_365# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_424_49# B a_1276_297# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=7.998e+11p ps=5.68e+06u
-M1013 a_1276_297# a_991_365# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_991_365# a_875_297# a_406_325# VNB nshort w=600000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1276_297# a_875_297# a_406_325# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A a_991_365# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_424_49# a_276_93# a_116_21# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_116_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=1.82e+11p ps=1.86e+06u
-M1019 VPWR a_116_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1020 a_406_325# a_276_93# a_116_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1276_297# a_991_365# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_991_365# B a_424_49# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_406_325# C a_116_21# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X2 a_406_325# a_875_297# a_991_365# VNB sky130_fd_pr__nfet_01v8 w=600000u l=150000u
+X3 X a_116_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_991_365# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_406_325# a_875_297# a_1276_297# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X6 a_116_21# a_276_93# a_424_49# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X7 VPWR B a_875_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 a_424_49# a_875_297# a_1276_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_991_365# B a_406_325# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X10 VGND C a_276_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND a_991_365# a_1276_297# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_1276_297# B a_424_49# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X13 a_116_21# a_276_93# a_406_325# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 X a_116_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VGND B a_875_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 a_991_365# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 VPWR C a_276_93# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X18 a_424_49# a_875_297# a_991_365# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X19 a_424_49# C a_116_21# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 VPWR a_991_365# a_1276_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X21 a_1276_297# B a_406_325# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_2.cdl b/cells/xor3/sky130_fd_sc_hdll__xor3_2.cdl
index ef23735..b74f54f 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_2.cdl
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_2.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hdll__xor3_2 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP3 X net117 VPB phighvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X net117 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 mid1 Cb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI1 mid2 C VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 Cb C VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 Cb VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI45 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 mid2 C VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 mid1 Bb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 Bb B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI23 mid1 B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 mid2 Bb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 mid2 B VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X net117 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ 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.18 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.18 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.18 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.0 l=0.18 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.18 mult=1 sa=0.265 sb=0.265
+MI17 Bb B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB phighvt m=1 w=0.64 l=0.18 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.18 mult=1 sa=0.265 sb=0.265
+MI25 Abb Bb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X net117 VNB nshort m=2 w=0.65 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nshort m=1 w=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.6 l=0.15 mult=1 sa=0.265 sb=0.265
+MI29 Ab Bb VNB nfet_01v8 m=1 w=0.6 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xor3_2
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_2.netlist.tsv b/cells/xor3/sky130_fd_sc_hdll__xor3_2.netlist.tsv
index 697eb49..773b121 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_2.netlist.tsv
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_2.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_hdll__xor3_2	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP3	MOSFET	X	net117	VPWR	VPB	phighvt	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	Cb	net117	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	mid2	C	net117	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	net117	VGND	VNB	nshort	2	0.65	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.65	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.6	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	net117	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.18	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.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net117	VGND	VNB	nfet_01v8	2	0.65	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.65	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.6	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_2.spice b/cells/xor3/sky130_fd_sc_hdll__xor3_2.spice
index 15646f9..21eb37a 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_2.spice
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_2.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hdll__xor3_2 A B C VGND VNB VPB VPWR X
-M1000 VPWR A a_1050_365# VPB phighvt w=1e+06u l=180000u
-+  ad=1.2694e+12p pd=1.06e+07u as=7.234e+11p ps=5.3e+06u
-M1001 X a_81_21# VGND VNB nshort w=650000u l=150000u
-+  ad=2.275e+11p pd=2e+06u as=8.9605e+11p ps=8e+06u
-M1002 a_81_21# C a_483_49# VNB nshort w=640000u l=150000u
-+  ad=2.848e+11p pd=2.17e+06u as=5.963e+11p ps=4.53e+06u
-M1003 a_483_49# a_335_93# a_81_21# VPB phighvt w=840000u l=180000u
-+  ad=7.558e+11p pd=5.2e+06u as=3.36e+11p ps=2.48e+06u
-M1004 a_934_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.126e+11p pd=2.64e+06u as=0p ps=0u
-M1005 a_465_325# B a_1335_297# VNB nshort w=640000u l=150000u
-+  ad=6.6045e+11p pd=4.67e+06u as=5.517e+11p ps=4.37e+06u
-M1006 VGND A a_1050_365# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=4.468e+11p ps=3.98e+06u
-M1007 X a_81_21# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1008 a_335_93# C VGND VNB nshort w=420000u l=150000u
-+  ad=1.974e+11p pd=1.78e+06u as=0p ps=0u
-M1009 a_483_49# B a_1050_365# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1050_365# a_934_297# a_483_49# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1335_297# a_934_297# a_483_49# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_335_93# C VPWR VPB phighvt w=640000u l=180000u
-+  ad=1.856e+11p pd=1.86e+06u as=0p ps=0u
-M1013 a_81_21# C a_465_325# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=7.824e+11p ps=5.28e+06u
-M1014 a_483_49# B a_1335_297# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=7.798e+11p ps=5.64e+06u
-M1015 a_1050_365# a_934_297# a_465_325# VNB nshort w=600000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_81_21# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1335_297# a_934_297# a_465_325# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_934_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=1.978e+11p pd=1.92e+06u as=0p ps=0u
-M1019 a_465_325# a_335_93# a_81_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1335_297# a_1050_365# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_465_325# B a_1050_365# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_81_21# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1335_297# a_1050_365# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B a_934_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X1 a_1050_365# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_1335_297# B a_465_325# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_465_325# C a_81_21# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X4 a_1335_297# B a_483_49# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X5 a_483_49# C a_81_21# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_483_49# a_934_297# a_1335_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_81_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VGND C a_335_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_483_49# a_934_297# a_1050_365# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X10 a_81_21# a_335_93# a_483_49# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X11 VGND a_1050_365# a_1335_297# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_465_325# a_934_297# a_1050_365# VNB sky130_fd_pr__nfet_01v8 w=600000u l=150000u
+X13 a_465_325# a_934_297# a_1335_297# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X14 a_1050_365# B a_465_325# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X15 a_1050_365# B a_483_49# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 VPWR a_1050_365# a_1335_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X17 X a_81_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X18 a_81_21# a_335_93# a_465_325# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 a_1050_365# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X20 VGND B a_934_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X21 VPWR C a_335_93# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X22 X a_81_21# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X23 VGND a_81_21# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
 .ends
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_4.cdl b/cells/xor3/sky130_fd_sc_hdll__xor3_4.cdl
index 9912e88..e437a62 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_4.cdl
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_4.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hdll__xor3_4 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP3 X net117 VPB phighvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X net117 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 mid1 Cb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI1 mid2 C VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 Cb C VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 Cb VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI45 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 mid2 C VPB phighvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 mid1 Bb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 Bb B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB phighvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI23 mid1 B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 mid2 Bb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 mid2 B VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X net117 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ 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.18 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.18 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.18 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.0 l=0.18 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.18 mult=1 sa=0.265 sb=0.265
+MI17 Bb B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB phighvt m=1 w=0.64 l=0.18 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.18 mult=1 sa=0.265 sb=0.265
+MI25 Abb Bb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X net117 VNB nshort m=4 w=0.65 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.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nshort m=1 w=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.6 l=0.15 mult=1 sa=0.265 sb=0.265
+MI29 Ab Bb VNB nfet_01v8 m=1 w=0.6 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xor3_4
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_4.netlist.tsv b/cells/xor3/sky130_fd_sc_hdll__xor3_4.netlist.tsv
index b56d85b..03b6483 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_4.netlist.tsv
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_4.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_hdll__xor3_4	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP3	MOSFET	X	net117	VPWR	VPB	phighvt	4	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	Cb	net117	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	mid2	C	net117	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	phighvt	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	phighvt	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	net117	VGND	VNB	nshort	4	0.65	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.65	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.6	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	net117	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.18	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.18	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.18	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.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	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.18	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.18	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.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net117	VGND	VNB	nfet_01v8	4	0.65	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.65	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.6	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_4.spice b/cells/xor3/sky130_fd_sc_hdll__xor3_4.spice
index 5537d7c..946eda1 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_4.spice
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_hdll__xor3_4 A B C VGND VNB VPB VPWR X
-M1000 VPWR a_80_207# X VPB phighvt w=1e+06u l=180000u
-+  ad=1.4908e+12p pd=1.305e+07u as=5.8e+11p ps=5.16e+06u
-M1001 a_658_49# a_528_297# a_80_207# VPB phighvt w=840000u l=180000u
-+  ad=7.558e+11p pd=5.2e+06u as=3.36e+11p ps=2.48e+06u
-M1002 VGND a_80_207# X VNB nshort w=650000u l=150000u
-+  ad=1.2254e+12p pd=1.035e+07u as=4.16e+11p ps=3.88e+06u
-M1003 a_658_49# B a_1225_365# VNB nshort w=640000u l=150000u
-+  ad=5.931e+11p pd=4.52e+06u as=4.468e+11p ps=3.98e+06u
-M1004 a_1109_297# B VGND VNB nshort w=650000u l=150000u
-+  ad=1.653e+11p pd=1.82e+06u as=0p ps=0u
-M1005 a_80_207# C a_658_49# VNB nshort w=640000u l=150000u
-+  ad=2.88e+11p pd=2.18e+06u as=0p ps=0u
-M1006 a_1225_365# a_1109_297# a_658_49# VPB phighvt w=840000u l=180000u
-+  ad=7.234e+11p pd=5.3e+06u as=0p ps=0u
-M1007 a_80_207# C a_652_325# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=7.32e+11p ps=5.16e+06u
-M1008 a_658_49# B a_1510_297# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=7.748e+11p ps=5.63e+06u
-M1009 VPWR A a_1225_365# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1510_297# a_1225_365# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_80_207# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_80_207# X VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_652_325# a_528_297# a_80_207# VNB nshort w=640000u l=150000u
-+  ad=6.6045e+11p pd=4.67e+06u as=0p ps=0u
-M1014 a_1510_297# a_1109_297# a_652_325# VPB phighvt w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A a_1225_365# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_80_207# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_80_207# X VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_652_325# B a_1225_365# VPB phighvt w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_80_207# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_528_297# C VPWR VPB phighvt w=640000u l=180000u
-+  ad=2.112e+11p pd=1.94e+06u as=0p ps=0u
-M1021 a_1510_297# a_1109_297# a_658_49# VNB nshort w=420000u l=150000u
-+  ad=5.517e+11p pd=4.37e+06u as=0p ps=0u
-M1022 a_1109_297# B VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=3.126e+11p pd=2.64e+06u as=0p ps=0u
-M1023 a_528_297# C VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1024 a_1510_297# a_1225_365# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_80_207# VGND VNB nshort w=650000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_652_325# B a_1510_297# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1225_365# a_1109_297# a_652_325# VNB nshort w=600000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_80_207# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X1 a_1225_365# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X2 a_658_49# a_1109_297# a_1225_365# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X3 a_80_207# a_528_297# a_652_325# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 VPWR a_80_207# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X5 a_80_207# a_528_297# a_658_49# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X6 a_652_325# a_1109_297# a_1225_365# VNB sky130_fd_pr__nfet_01v8 w=600000u l=150000u
+X7 X a_80_207# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X8 VPWR a_1225_365# a_1510_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 a_1510_297# B a_652_325# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 X a_80_207# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X11 a_652_325# a_1109_297# a_1510_297# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X12 VPWR B a_1109_297# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X13 a_1225_365# B a_652_325# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X14 X a_80_207# VGND VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X15 VGND B a_1109_297# VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X16 VGND a_80_207# X VNB sky130_fd_pr__nfet_01v8 w=650000u l=150000u
+X17 a_652_325# C a_80_207# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=180000u
+X18 a_1510_297# B a_658_49# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X19 VGND C a_528_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_658_49# C a_80_207# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 a_1225_365# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 VPWR C a_528_297# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=180000u
+X23 VGND a_1225_365# a_1510_297# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 X a_80_207# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X25 a_658_49# a_1109_297# a_1510_297# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VPWR a_80_207# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X27 a_1225_365# B a_658_49# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends