Updating spice files for names in pending `sky130_fd_pr` release.

Updating sky130_fd_sc_hdll 0.1.1.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
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