diff --git a/cells/a2111o/sky130_fd_sc_ms__a2111o_1.cdl b/cells/a2111o/sky130_fd_sc_ms__a2111o_1.cdl
index 16a7d23..3c6e0de 100644
--- a/cells/a2111o/sky130_fd_sc_ms__a2111o_1.cdl
+++ b/cells/a2111o/sky130_fd_sc_ms__a2111o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__a2111o_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 pndC C1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 pndC C1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 y D1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPD0 y D1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=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 nlowvt m=1 w=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 nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMND0 y D1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=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 nfet_01v8_lvt m=1 w=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_lvt m=1 w=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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMND0 y D1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a2111o_1
diff --git a/cells/a2111o/sky130_fd_sc_ms__a2111o_1.netlist.tsv b/cells/a2111o/sky130_fd_sc_ms__a2111o_1.netlist.tsv
index 4a602f6..5ca455e 100644
--- a/cells/a2111o/sky130_fd_sc_ms__a2111o_1.netlist.tsv
+++ b/cells/a2111o/sky130_fd_sc_ms__a2111o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__a2111o_1	A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	y	D1	pndC	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	pndC	C1	pndB	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	y	D1	pndC	VPB	pfet_01v8	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	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	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_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2111o/sky130_fd_sc_ms__a2111o_1.spice b/cells/a2111o/sky130_fd_sc_ms__a2111o_1.spice
index b2d8272..79d5d8c 100644
--- a/cells/a2111o/sky130_fd_sc_ms__a2111o_1.spice
+++ b/cells/a2111o/sky130_fd_sc_ms__a2111o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__a2111o_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 a_80_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.3e+11p pd=5.06e+06u as=6.012e+11p ps=5.38e+06u
-M1001 a_356_392# B1 a_80_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.1e+11p pd=2.42e+06u as=0p ps=0u
-M1002 a_168_136# A1 a_85_136# VNB nlowvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=5.184e+11p ps=5.46e+06u
-M1003 a_85_136# D1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=7.465e+11p ps=6.29e+06u
-M1004 a_85_136# D1 a_434_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.6e+11p pd=2.52e+06u as=2.1e+11p ps=2.42e+06u
-M1005 VGND A2 a_168_136# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_85_136# B1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND C1 a_85_136# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_85_136# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1009 a_434_392# C1 a_356_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1 a_80_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_85_136# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
+X0 a_80_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_80_392# B1 a_356_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_356_392# C1 a_434_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 VGND B1 a_85_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 VPWR A2 a_80_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_434_392# D1 a_85_136# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 VPWR a_85_136# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_85_136# A1 a_168_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 VGND D1 a_85_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_85_136# C1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_168_136# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 VGND a_85_136# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a2111o/sky130_fd_sc_ms__a2111o_2.cdl b/cells/a2111o/sky130_fd_sc_ms__a2111o_2.cdl
index 6c43f22..748dfe9 100644
--- a/cells/a2111o/sky130_fd_sc_ms__a2111o_2.cdl
+++ b/cells/a2111o/sky130_fd_sc_ms__a2111o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__a2111o_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 pndC C1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 pndC C1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 y D1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPD0 y D1 VPB pfet_01v8 m=1 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMND0 y D1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMND0 y D1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a2111o_2
diff --git a/cells/a2111o/sky130_fd_sc_ms__a2111o_2.netlist.tsv b/cells/a2111o/sky130_fd_sc_ms__a2111o_2.netlist.tsv
index 8ce5146..ce5e1b9 100644
--- a/cells/a2111o/sky130_fd_sc_ms__a2111o_2.netlist.tsv
+++ b/cells/a2111o/sky130_fd_sc_ms__a2111o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__a2111o_2	A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	y	D1	pndC	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	pndC	C1	pndB	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	y	D1	pndC	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2111o/sky130_fd_sc_ms__a2111o_2.spice b/cells/a2111o/sky130_fd_sc_ms__a2111o_2.spice
index bb426d1..23cfe8f 100644
--- a/cells/a2111o/sky130_fd_sc_ms__a2111o_2.spice
+++ b/cells/a2111o/sky130_fd_sc_ms__a2111o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__a2111o_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 a_633_368# B1 a_525_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.944e+11p pd=5.72e+06u as=4.032e+11p ps=2.96e+06u
-M1001 a_447_368# D1 a_91_244# VPB pshort w=1.12e+06u l=180000u
-+  ad=2.352e+11p pd=2.66e+06u as=2.912e+11p ps=2.76e+06u
-M1002 VPWR A2 a_633_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=9.856e+11p pd=8.48e+06u as=0p ps=0u
-M1003 a_91_244# C1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=5.994e+11p pd=6.06e+06u as=1.0508e+12p ps=8.76e+06u
-M1004 X a_91_244# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1005 VPWR a_91_244# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_525_368# C1 a_447_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_633_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_91_244# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1009 X a_91_244# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_771_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.554e+11p pd=1.9e+06u as=0p ps=0u
-M1011 a_91_244# A1 a_771_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B1 a_91_244# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND D1 a_91_244# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_91_244# D1 a_447_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 X a_91_244# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_447_368# C1 a_525_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_633_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_91_244# D1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_91_244# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VGND A2 a_771_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR a_91_244# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_525_368# B1 a_633_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VPWR A1 a_633_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 VGND a_91_244# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 X a_91_244# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VGND C1 a_91_244# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_771_74# A1 a_91_244# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a2111o/sky130_fd_sc_ms__a2111o_4.cdl b/cells/a2111o/sky130_fd_sc_ms__a2111o_4.cdl
index 09476ce..5907bb0 100644
--- a/cells/a2111o/sky130_fd_sc_ms__a2111o_4.cdl
+++ b/cells/a2111o/sky130_fd_sc_ms__a2111o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__a2111o_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=2 w=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 pndC C1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 pndC C1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 y D1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPD0 y D1 VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=2 w=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 nlowvt m=2 w=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 nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMND0 y D1 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=2 w=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 nfet_01v8_lvt m=2 w=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_lvt m=2 w=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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMND0 y D1 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a2111o_4
diff --git a/cells/a2111o/sky130_fd_sc_ms__a2111o_4.netlist.tsv b/cells/a2111o/sky130_fd_sc_ms__a2111o_4.netlist.tsv
index 4d342b5..a5cd1d2 100644
--- a/cells/a2111o/sky130_fd_sc_ms__a2111o_4.netlist.tsv
+++ b/cells/a2111o/sky130_fd_sc_ms__a2111o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__a2111o_4	A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	y	D1	pndC	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	pndC	C1	pndB	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	y	D1	pndC	VPB	pfet_01v8	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2111o/sky130_fd_sc_ms__a2111o_4.spice b/cells/a2111o/sky130_fd_sc_ms__a2111o_4.spice
index 9c7b7e0..33a1ac6 100644
--- a/cells/a2111o/sky130_fd_sc_ms__a2111o_4.spice
+++ b/cells/a2111o/sky130_fd_sc_ms__a2111o_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__a2111o_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 a_1013_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=1.06e+12p pd=1.012e+07u as=1.4248e+12p ps=1.338e+07u
-M1001 a_137_260# A1 a_1210_74# VNB nlowvt w=640000u l=150000u
-+  ad=7.168e+11p pd=7.36e+06u as=5.184e+11p ps=5.46e+06u
-M1002 a_137_260# D1 a_549_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=7.9e+11p ps=7.58e+06u
-M1003 VGND a_137_260# X VNB nlowvt w=740000u l=150000u
-+  ad=1.3711e+12p pd=1.359e+07u as=4.144e+11p ps=4.08e+06u
-M1004 VGND C1 a_137_260# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_549_392# D1 a_137_260# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_817_392# C1 a_549_392# VPB pshort w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=0p ps=0u
-M1007 a_1210_74# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_549_392# C1 a_817_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B1 a_137_260# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_137_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_137_260# D1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1210_74# A1 a_137_260# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_817_392# B1 a_1013_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_137_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1015 a_1013_392# B1 a_817_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_137_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A1 a_1013_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_137_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1013_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_137_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND D1 a_137_260# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_137_260# C1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_137_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_137_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR A2 a_1013_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_137_260# B1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A2 a_1210_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1013_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 X a_137_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_137_260# D1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_1013_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VGND A2 a_1210_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_137_260# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 a_549_392# D1 a_137_260# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 X a_137_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_137_260# D1 a_549_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 X a_137_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_817_392# C1 a_549_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_817_392# B1 a_1013_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 X a_137_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VPWR A1 a_1013_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 VGND a_137_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_137_260# A1 a_1210_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X16 VPWR A2 a_1013_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X17 VGND C1 a_137_260# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X18 a_1210_74# A1 a_137_260# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X19 VPWR a_137_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 VGND a_137_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 VGND D1 a_137_260# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X22 a_1210_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X23 VPWR a_137_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_549_392# C1 a_817_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X25 VGND B1 a_137_260# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X26 a_137_260# C1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X27 a_1013_392# B1 a_817_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.cdl b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.cdl
index c6737a3..a5d8386 100644
--- a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.cdl
+++ b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__a2111oi_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 pndC C1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 pndC C1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 Y D1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPD0 Y D1 VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMND0 Y D1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMND0 Y D1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a2111oi_1
diff --git a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.netlist.tsv b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.netlist.tsv
index 99dc0bb..873a7c3 100644
--- a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.netlist.tsv
+++ b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__a2111oi_1	A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	Y	D1	pndC	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	pndC	C1	pndB	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	Y	D1	pndC	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.spice b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.spice
index 3346090..da3b66e 100644
--- a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.spice
+++ b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__a2111oi_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 a_345_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.944e+11p pd=5.72e+06u as=4.032e+11p ps=2.96e+06u
-M1001 VGND A2 a_461_74# VNB nlowvt w=740000u l=150000u
-+  ad=7.77e+11p pd=6.54e+06u as=2.368e+11p ps=2.12e+06u
-M1002 a_461_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1003 Y D1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_237_368# C1 a_159_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=4.032e+11p pd=2.96e+06u as=2.352e+11p ps=2.66e+06u
-M1005 a_345_368# B1 a_237_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_159_368# D1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.912e+11p ps=2.76e+06u
-M1008 VPWR A1 a_345_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_345_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_159_368# C1 a_237_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Y C1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 Y A1 a_461_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VPWR A2 a_345_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_461_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_237_368# B1 a_345_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 Y D1 a_159_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VGND D1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.cdl b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.cdl
index 075bc9a..5fd09b8 100644
--- a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.cdl
+++ b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__a2111oi_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 pndC C1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 pndC C1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 Y D1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPD0 Y D1 VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMND0 Y D1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMND0 Y D1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a2111oi_2
diff --git a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.netlist.tsv b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.netlist.tsv
index 869bc63..838a416 100644
--- a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.netlist.tsv
+++ b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__a2111oi_2	A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	Y	D1	pndC	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	pndC	C1	pndB	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	Y	D1	pndC	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.spice b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.spice
index a01d0d9..8da8e87 100644
--- a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.spice
+++ b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.spice
@@ -16,38 +16,21 @@
 
 
 .subckt sky130_fd_sc_ms__a2111oi_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 VGND C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=7.141e+11p pd=6.37e+06u as=6.919e+11p ps=6.31e+06u
-M1001 a_722_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=5.994e+11p pd=6.06e+06u as=0p ps=0u
-M1002 a_533_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.1872e+12p pd=1.108e+07u as=6.048e+11p ps=5.56e+06u
-M1003 Y D1 a_69_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=8.848e+11p ps=8.3e+06u
-M1004 a_69_368# D1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_722_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_337_368# C1 a_69_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1007 Y D1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_69_368# C1 a_337_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_337_368# B1 a_533_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_533_368# B1 a_337_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A1 a_533_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A2 a_722_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A1 a_722_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_533_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A2 a_533_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_69_368# D1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_722_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_69_368# C1 a_337_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 Y C1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_337_368# C1 a_69_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_533_368# B1 a_337_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_722_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_533_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 Y A1 a_722_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_533_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VPWR A2 a_533_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 VGND A2 a_722_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 Y D1 a_69_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_337_368# B1 a_533_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 VPWR A1 a_533_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VGND D1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.cdl b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.cdl
index fff865f..ec8e37d 100644
--- a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.cdl
+++ b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__a2111oi_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 pndC C1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 pndC C1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 Y D1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPD0 Y D1 VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMND0 Y D1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMND0 Y D1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a2111oi_4
diff --git a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.netlist.tsv b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.netlist.tsv
index 1267f21..995ac1d 100644
--- a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.netlist.tsv
+++ b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__a2111oi_4	A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	Y	D1	pndC	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	pndC	C1	pndB	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	Y	D1	pndC	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.spice b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.spice
index 8b9f1cf..87db8e5 100644
--- a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.spice
+++ b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ms__a2111oi_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 a_477_368# C1 a_29_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2096e+12p pd=1.112e+07u as=1.4896e+12p ps=1.386e+07u
-M1001 VPWR A1 a_853_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2096e+12p pd=1.112e+07u as=2.1168e+12p ps=1.946e+07u
-M1002 a_29_368# C1 a_477_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_853_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_477_368# C1 a_29_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A2 a_853_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_29_368# C1 a_477_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_1228_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.0434e+12p pd=1.022e+07u as=1.887e+12p ps=1.398e+07u
-M1008 a_853_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1228_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.036e+12p ps=1.02e+07u
-M1010 VPWR A2 a_853_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1228_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_477_368# B1 a_853_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_853_368# B1 a_477_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_853_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y C1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y D1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A2 a_1228_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_477_368# B1 a_853_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y D1 a_29_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1022 a_29_368# D1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1228_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_853_368# B1 a_477_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y D1 a_29_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A2 a_1228_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR A1 a_853_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND D1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y A1 a_1228_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_29_368# D1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_853_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y A1 a_1228_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_853_368# B1 a_477_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VGND A2 a_1228_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_477_368# B1 a_853_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_29_368# D1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_29_368# C1 a_477_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_853_368# B1 a_477_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_29_368# C1 a_477_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_853_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_1228_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND D1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_853_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_853_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VGND C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_853_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_1228_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 Y D1 a_29_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VPWR A2 a_853_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 Y D1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 Y D1 a_29_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_1228_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 Y C1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 a_477_368# C1 a_29_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_477_368# B1 a_853_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 VGND B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 Y A1 a_1228_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 a_477_368# C1 a_29_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 VPWR A1 a_853_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 a_1228_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 VPWR A1 a_853_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X30 VGND A2 a_1228_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 Y A1 a_1228_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X32 a_29_368# D1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X33 VPWR A2 a_853_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/a211o/sky130_fd_sc_ms__a211o_1.cdl b/cells/a211o/sky130_fd_sc_ms__a211o_1.cdl
index f5564a2..85ca2f4 100644
--- a/cells/a211o/sky130_fd_sc_ms__a211o_1.cdl
+++ b/cells/a211o/sky130_fd_sc_ms__a211o_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 y C1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=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 nlowvt m=1 w=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 nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=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 nfet_01v8_lvt m=1 w=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_lvt m=1 w=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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a211o_1
diff --git a/cells/a211o/sky130_fd_sc_ms__a211o_1.netlist.tsv b/cells/a211o/sky130_fd_sc_ms__a211o_1.netlist.tsv
index f7f0fce..8ebc2ea 100644
--- a/cells/a211o/sky130_fd_sc_ms__a211o_1.netlist.tsv
+++ b/cells/a211o/sky130_fd_sc_ms__a211o_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	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_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211o/sky130_fd_sc_ms__a211o_1.spice b/cells/a211o/sky130_fd_sc_ms__a211o_1.spice
index e9f83ee..c112712 100644
--- a/cells/a211o/sky130_fd_sc_ms__a211o_1.spice
+++ b/cells/a211o/sky130_fd_sc_ms__a211o_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__a211o_1 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 VGND a_81_264# X VNB nlowvt w=740000u l=150000u
-+  ad=5.3685e+11p pd=4.68e+06u as=1.961e+11p ps=2.01e+06u
-M1001 a_81_264# C1 a_553_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.6e+11p pd=2.52e+06u as=2.1e+11p ps=2.42e+06u
-M1002 a_279_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.3e+11p pd=5.06e+06u as=5.912e+11p ps=5.36e+06u
-M1003 VGND B1 a_81_264# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.488e+11p ps=3.65e+06u
-M1004 a_81_264# C1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_553_392# B1 a_279_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_366_136# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=2.08e+11p pd=1.93e+06u as=0p ps=0u
-M1007 VPWR a_81_264# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.912e+11p ps=2.76e+06u
-M1008 a_81_264# A1 a_366_136# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A2 a_279_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_81_264# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VPWR A1 a_279_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VGND C1 a_81_264# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_553_392# C1 a_81_264# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_279_392# B1 a_553_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_279_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 X a_81_264# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_81_264# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 VGND A2 a_366_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_366_136# A1 a_81_264# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/a211o/sky130_fd_sc_ms__a211o_2.cdl b/cells/a211o/sky130_fd_sc_ms__a211o_2.cdl
index 59f8145..433a2d3 100644
--- a/cells/a211o/sky130_fd_sc_ms__a211o_2.cdl
+++ b/cells/a211o/sky130_fd_sc_ms__a211o_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 y C1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a211o_2
diff --git a/cells/a211o/sky130_fd_sc_ms__a211o_2.netlist.tsv b/cells/a211o/sky130_fd_sc_ms__a211o_2.netlist.tsv
index 00f42c8..664b693 100644
--- a/cells/a211o/sky130_fd_sc_ms__a211o_2.netlist.tsv
+++ b/cells/a211o/sky130_fd_sc_ms__a211o_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211o/sky130_fd_sc_ms__a211o_2.spice b/cells/a211o/sky130_fd_sc_ms__a211o_2.spice
index 2ee2f2e..2a3912f 100644
--- a/cells/a211o/sky130_fd_sc_ms__a211o_2.spice
+++ b/cells/a211o/sky130_fd_sc_ms__a211o_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__a211o_2 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_317_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.3e+11p pd=5.06e+06u as=9.424e+11p ps=8.24e+06u
-M1001 a_85_270# A1 a_399_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.847e+11p pd=4.27e+06u as=1.554e+11p ps=1.9e+06u
-M1002 a_603_392# B1 a_317_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1003 a_399_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=9.731e+11p ps=7.07e+06u
-M1004 VGND a_85_270# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1005 VGND B1 a_85_270# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_85_270# C1 a_603_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
-M1007 VPWR A2 a_317_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_85_270# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_85_270# C1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_85_270# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1011 VPWR a_85_270# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_85_270# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VGND C1 a_85_270# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_317_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 VPWR a_85_270# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_399_74# A1 a_85_270# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VPWR A1 a_317_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 VGND A2 a_399_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_603_392# C1 a_85_270# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 X a_85_270# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 X a_85_270# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 VGND a_85_270# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_317_392# B1 a_603_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/a211o/sky130_fd_sc_ms__a211o_4.cdl b/cells/a211o/sky130_fd_sc_ms__a211o_4.cdl
index a6b06f7..eee630a 100644
--- a/cells/a211o/sky130_fd_sc_ms__a211o_4.cdl
+++ b/cells/a211o/sky130_fd_sc_ms__a211o_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 y C1 VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=2 w=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 nlowvt m=2 w=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 nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=2 w=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 nfet_01v8_lvt m=2 w=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_lvt m=2 w=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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a211o_4
diff --git a/cells/a211o/sky130_fd_sc_ms__a211o_4.netlist.tsv b/cells/a211o/sky130_fd_sc_ms__a211o_4.netlist.tsv
index 5e1c20f..8ad49be 100644
--- a/cells/a211o/sky130_fd_sc_ms__a211o_4.netlist.tsv
+++ b/cells/a211o/sky130_fd_sc_ms__a211o_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211o/sky130_fd_sc_ms__a211o_4.spice b/cells/a211o/sky130_fd_sc_ms__a211o_4.spice
index 9410d27..a8591ad 100644
--- a/cells/a211o/sky130_fd_sc_ms__a211o_4.spice
+++ b/cells/a211o/sky130_fd_sc_ms__a211o_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__a211o_4 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_1064_123# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=1.50765e+12p ps=1.284e+07u
-M1001 X a_105_280# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1002 a_105_280# A1 a_1064_123# VNB nlowvt w=640000u l=150000u
-+  ad=5.79525e+11p pd=5.76e+06u as=0p ps=0u
-M1003 VPWR A1 a_517_392# VPB pshort w=1e+06u l=180000u
-+  ad=1.7798e+12p pd=1.409e+07u as=1.065e+12p ps=1.013e+07u
-M1004 a_517_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_105_280# B1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_105_280# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1007 VGND a_105_280# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_105_280# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_105_280# C1 a_605_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=6.15e+11p ps=5.23e+06u
-M1010 a_605_392# B1 a_517_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_105_280# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_605_392# C1 a_105_280# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND B1 a_105_280# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A2 a_517_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_105_280# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_105_280# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1064_123# A1 a_105_280# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_517_392# B1 a_605_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_105_280# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_105_280# C1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND C1 a_105_280# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_517_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A2 a_1064_123# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_105_280# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 VGND A2 a_1064_123# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_1064_123# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 VPWR a_105_280# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VGND a_105_280# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 X a_105_280# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 X a_105_280# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 X a_105_280# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_105_280# C1 a_605_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 a_1064_123# A1 a_105_280# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_105_280# A1 a_1064_123# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 X a_105_280# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_605_392# B1 a_517_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 VPWR A2 a_517_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 a_105_280# C1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 a_517_392# B1 a_605_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 VGND B1 a_105_280# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 VPWR a_105_280# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 VGND C1 a_105_280# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X19 a_605_392# C1 a_105_280# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X20 a_517_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X21 VPWR A1 a_517_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X22 a_517_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X23 VGND a_105_280# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a211oi/sky130_fd_sc_ms__a211oi_1.cdl b/cells/a211oi/sky130_fd_sc_ms__a211oi_1.cdl
index 2325258..2ea8a1a 100644
--- a/cells/a211oi/sky130_fd_sc_ms__a211oi_1.cdl
+++ b/cells/a211oi/sky130_fd_sc_ms__a211oi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 Y C1 VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a211oi_1
diff --git a/cells/a211oi/sky130_fd_sc_ms__a211oi_1.netlist.tsv b/cells/a211oi/sky130_fd_sc_ms__a211oi_1.netlist.tsv
index 0ddf833..9f2cf78 100644
--- a/cells/a211oi/sky130_fd_sc_ms__a211oi_1.netlist.tsv
+++ b/cells/a211oi/sky130_fd_sc_ms__a211oi_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211oi/sky130_fd_sc_ms__a211oi_1.spice b/cells/a211oi/sky130_fd_sc_ms__a211oi_1.spice
index 347db3b..185529d 100644
--- a/cells/a211oi/sky130_fd_sc_ms__a211oi_1.spice
+++ b/cells/a211oi/sky130_fd_sc_ms__a211oi_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__a211oi_1 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_71_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=5.936e+11p pd=5.54e+06u as=4.032e+11p ps=2.96e+06u
-M1001 Y A1 a_159_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.847e+11p pd=4.27e+06u as=1.554e+11p ps=1.9e+06u
-M1002 a_357_368# B1 a_71_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1003 a_159_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.847e+11p ps=4.27e+06u
-M1004 VGND B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A2 a_71_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y C1 a_357_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1007 Y C1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_357_368# C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR A1 a_71_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_159_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_71_368# B1 a_357_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_71_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND A2 a_159_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a211oi/sky130_fd_sc_ms__a211oi_2.cdl b/cells/a211oi/sky130_fd_sc_ms__a211oi_2.cdl
index c50343f..fc95e95 100644
--- a/cells/a211oi/sky130_fd_sc_ms__a211oi_2.cdl
+++ b/cells/a211oi/sky130_fd_sc_ms__a211oi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 Y C1 VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a211oi_2
diff --git a/cells/a211oi/sky130_fd_sc_ms__a211oi_2.netlist.tsv b/cells/a211oi/sky130_fd_sc_ms__a211oi_2.netlist.tsv
index 572160f..64db78b 100644
--- a/cells/a211oi/sky130_fd_sc_ms__a211oi_2.netlist.tsv
+++ b/cells/a211oi/sky130_fd_sc_ms__a211oi_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211oi/sky130_fd_sc_ms__a211oi_2.spice b/cells/a211oi/sky130_fd_sc_ms__a211oi_2.spice
index 46ce1b8..808b21a 100644
--- a/cells/a211oi/sky130_fd_sc_ms__a211oi_2.spice
+++ b/cells/a211oi/sky130_fd_sc_ms__a211oi_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__a211oi_2 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_38_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=6.216e+11p pd=6.12e+06u as=6.438e+11p ps=6.18e+06u
-M1001 Y B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=7.4e+11p pd=4.96e+06u as=0p ps=0u
-M1002 VGND A2 a_38_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_117_368# B1 a_497_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=9.072e+11p pd=8.34e+06u as=9.072e+11p ps=8.34e+06u
-M1004 VGND C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_497_368# B1 a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y C1 a_497_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1007 Y A1 a_38_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_497_368# C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_38_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_117_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=9.072e+11p ps=8.34e+06u
-M1011 VPWR A1 a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_117_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A2 a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_117_368# B1 a_497_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y C1 a_497_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Y A1 a_38_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_38_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_117_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_38_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_117_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_497_368# B1 a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 Y C1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_497_368# C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VGND A2 a_38_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VGND B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VPWR A1 a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/a211oi/sky130_fd_sc_ms__a211oi_4.cdl b/cells/a211oi/sky130_fd_sc_ms__a211oi_4.cdl
index 6e75a16..11b622d 100644
--- a/cells/a211oi/sky130_fd_sc_ms__a211oi_4.cdl
+++ b/cells/a211oi/sky130_fd_sc_ms__a211oi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 Y C1 VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a211oi_4
diff --git a/cells/a211oi/sky130_fd_sc_ms__a211oi_4.netlist.tsv b/cells/a211oi/sky130_fd_sc_ms__a211oi_4.netlist.tsv
index b1d48e0..2b7f657 100644
--- a/cells/a211oi/sky130_fd_sc_ms__a211oi_4.netlist.tsv
+++ b/cells/a211oi/sky130_fd_sc_ms__a211oi_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211oi/sky130_fd_sc_ms__a211oi_4.spice b/cells/a211oi/sky130_fd_sc_ms__a211oi_4.spice
index 01bb4c0..606846d 100644
--- a/cells/a211oi/sky130_fd_sc_ms__a211oi_4.spice
+++ b/cells/a211oi/sky130_fd_sc_ms__a211oi_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__a211oi_4 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_92_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=1.0286e+12p pd=1.018e+07u as=1.0138e+12p ps=1.014e+07u
-M1001 Y B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=8.288e+11p ps=8.16e+06u
-M1002 Y C1 a_901_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=1.4896e+12p ps=1.386e+07u
-M1003 VGND A2 a_92_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_901_368# C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A2 a_92_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A2 a_77_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2096e+12p pd=1.112e+07u as=2.0944e+12p ps=1.942e+07u
-M1007 a_77_368# B1 a_901_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A1 a_92_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_77_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_92_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A2 a_77_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_92_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_901_368# B1 a_77_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_77_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_77_368# B1 a_901_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A1 a_92_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A1 a_77_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_901_368# B1 a_77_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_77_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y C1 a_901_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR A1 a_77_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_901_368# C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_77_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_92_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_77_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_901_368# B1 a_77_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VPWR A2 a_77_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_901_368# C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 Y B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VGND C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_77_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y C1 a_901_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 Y C1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_77_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_92_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_92_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VGND B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_901_368# B1 a_77_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_92_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_77_368# B1 a_901_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_77_368# B1 a_901_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VGND A2 a_92_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 Y A1 a_92_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_77_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_77_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 Y C1 a_901_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 Y A1 a_92_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 VPWR A2 a_77_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_901_368# C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 VGND A2 a_92_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 VPWR A1 a_77_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 a_92_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a21bo/sky130_fd_sc_ms__a21bo_1.cdl b/cells/a21bo/sky130_fd_sc_ms__a21bo_1.cdl
index 07ff429..3ebd74e 100644
--- a/cells/a21bo/sky130_fd_sc_ms__a21bo_1.cdl
+++ b/cells/a21bo/sky130_fd_sc_ms__a21bo_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 y B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPB1N B1 B1_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 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 nlowvt m=1 w=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 nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=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 nfet_01v8_lvt m=1 w=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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a21bo_1
diff --git a/cells/a21bo/sky130_fd_sc_ms__a21bo_1.netlist.tsv b/cells/a21bo/sky130_fd_sc_ms__a21bo_1.netlist.tsv
index a00a66f..0725ba6 100644
--- a/cells/a21bo/sky130_fd_sc_ms__a21bo_1.netlist.tsv
+++ b/cells/a21bo/sky130_fd_sc_ms__a21bo_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	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_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21bo/sky130_fd_sc_ms__a21bo_1.spice b/cells/a21bo/sky130_fd_sc_ms__a21bo_1.spice
index 10a2eee..ae2c5ca 100644
--- a/cells/a21bo/sky130_fd_sc_ms__a21bo_1.spice
+++ b/cells/a21bo/sky130_fd_sc_ms__a21bo_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__a21bo_1 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 a_34_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.3e+11p pd=5.06e+06u as=6.766e+11p ps=5.55e+06u
-M1001 X a_194_136# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1002 a_122_136# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=5.6545e+11p ps=5.75e+06u
-M1003 X a_194_136# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1004 VGND a_272_110# a_194_136# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.496e+11p ps=2.06e+06u
-M1005 a_194_136# a_272_110# a_34_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
-M1006 VPWR A2 a_34_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B1_N a_272_110# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.184e+11p ps=2.2e+06u
-M1008 VGND B1_N a_272_110# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1009 a_194_136# A1 a_122_136# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_34_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_272_110# B1_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 VPWR A1 a_34_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 VGND a_194_136# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_194_136# a_272_110# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_122_136# A1 a_194_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VPWR a_194_136# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND A2 a_122_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_34_392# a_272_110# a_194_136# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 a_272_110# B1_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
 .ends
diff --git a/cells/a21bo/sky130_fd_sc_ms__a21bo_2.cdl b/cells/a21bo/sky130_fd_sc_ms__a21bo_2.cdl
index 32e1127..51a8703 100644
--- a/cells/a21bo/sky130_fd_sc_ms__a21bo_2.cdl
+++ b/cells/a21bo/sky130_fd_sc_ms__a21bo_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 y B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPB1N B1 B1_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a21bo_2
diff --git a/cells/a21bo/sky130_fd_sc_ms__a21bo_2.netlist.tsv b/cells/a21bo/sky130_fd_sc_ms__a21bo_2.netlist.tsv
index a44cb4c..65d5928 100644
--- a/cells/a21bo/sky130_fd_sc_ms__a21bo_2.netlist.tsv
+++ b/cells/a21bo/sky130_fd_sc_ms__a21bo_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21bo/sky130_fd_sc_ms__a21bo_2.spice b/cells/a21bo/sky130_fd_sc_ms__a21bo_2.spice
index 4a05d8c..b6e9600 100644
--- a/cells/a21bo/sky130_fd_sc_ms__a21bo_2.spice
+++ b/cells/a21bo/sky130_fd_sc_ms__a21bo_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__a21bo_2 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 VGND a_187_244# X VNB nlowvt w=740000u l=150000u
-+  ad=9.689e+11p pd=7.11e+06u as=2.072e+11p ps=2.04e+06u
-M1001 VPWR B1_N a_32_368# VPB pshort w=840000u l=180000u
-+  ad=9.154e+11p pd=8.21e+06u as=2.184e+11p ps=2.2e+06u
-M1002 X a_187_244# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1003 a_187_244# a_32_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1004 VPWR a_187_244# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_187_244# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_507_392# a_32_368# a_187_244# VPB pshort w=1e+06u l=180000u
-+  ad=5.3e+11p pd=5.06e+06u as=2.6e+11p ps=2.52e+06u
-M1007 VPWR A1 a_507_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_507_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2 a_587_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.368e+11p ps=2.12e+06u
-M1010 VGND B1_N a_32_368# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.4575e+11p ps=1.63e+06u
-M1011 a_587_74# A1 a_187_244# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_507_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VPWR a_187_244# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_187_244# A1 a_587_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_32_368# B1_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X4 a_32_368# B1_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 X a_187_244# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VGND a_32_368# a_187_244# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VGND a_187_244# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_187_244# a_32_368# a_507_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 VPWR A2 a_507_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 X a_187_244# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_587_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a21bo/sky130_fd_sc_ms__a21bo_4.cdl b/cells/a21bo/sky130_fd_sc_ms__a21bo_4.cdl
index a4a47c2..b68a388 100644
--- a/cells/a21bo/sky130_fd_sc_ms__a21bo_4.cdl
+++ b/cells/a21bo/sky130_fd_sc_ms__a21bo_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 y B1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPB1N B1 B1_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 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 nlowvt m=2 w=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 nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=2 w=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 nfet_01v8_lvt m=2 w=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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a21bo_4
diff --git a/cells/a21bo/sky130_fd_sc_ms__a21bo_4.netlist.tsv b/cells/a21bo/sky130_fd_sc_ms__a21bo_4.netlist.tsv
index a6066d0..921d256 100644
--- a/cells/a21bo/sky130_fd_sc_ms__a21bo_4.netlist.tsv
+++ b/cells/a21bo/sky130_fd_sc_ms__a21bo_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21bo/sky130_fd_sc_ms__a21bo_4.spice b/cells/a21bo/sky130_fd_sc_ms__a21bo_4.spice
index 6c0557c..9c0ae87 100644
--- a/cells/a21bo/sky130_fd_sc_ms__a21bo_4.spice
+++ b/cells/a21bo/sky130_fd_sc_ms__a21bo_4.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ms__a21bo_4 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 a_184_338# a_29_392# a_596_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=1.06e+12p ps=1.012e+07u
-M1001 VPWR a_184_338# X VPB pshort w=1.12e+06u l=180000u
-+  ad=1.4998e+12p pd=1.353e+07u as=6.048e+11p ps=5.56e+06u
-M1002 a_596_392# a_29_392# a_184_338# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_184_338# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=1.34918e+12p ps=1.097e+07u
-M1004 X a_184_338# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A2 a_596_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_184_338# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_596_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_184_338# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B1_N a_29_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1010 a_864_123# A1 a_184_338# VNB nlowvt w=640000u l=150000u
-+  ad=3.968e+11p pd=3.8e+06u as=3.584e+11p ps=3.68e+06u
-M1011 X a_184_338# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A2 a_864_123# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_184_338# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_184_338# A1 a_864_123# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A1 a_596_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR B1_N a_29_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.6e+11p ps=2.52e+06u
-M1017 VGND a_29_392# a_184_338# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_596_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_864_123# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_184_338# a_29_392# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_184_338# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_864_123# A1 a_184_338# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 VGND a_184_338# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 X a_184_338# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_184_338# a_29_392# a_596_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 X a_184_338# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VPWR A1 a_596_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_29_392# B1_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 X a_184_338# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_596_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 VPWR A2 a_596_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_596_392# a_29_392# a_184_338# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 VPWR a_184_338# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_596_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 a_184_338# a_29_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 a_184_338# A1 a_864_123# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 VPWR a_184_338# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VGND a_29_392# a_184_338# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 VGND a_184_338# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 X a_184_338# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 VGND A2 a_864_123# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X20 a_29_392# B1_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X21 a_864_123# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/a21boi/sky130_fd_sc_ms__a21boi_1.cdl b/cells/a21boi/sky130_fd_sc_ms__a21boi_1.cdl
index e59ee62..2c5d9fc 100644
--- a/cells/a21boi/sky130_fd_sc_ms__a21boi_1.cdl
+++ b/cells/a21boi/sky130_fd_sc_ms__a21boi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 net28 A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 net28 A1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 net28 A2 VPB pfet_01v8 m=1 w=1.12 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 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 net28 A2 VPB pshort m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPB1N B1 B1_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a21boi_1
diff --git a/cells/a21boi/sky130_fd_sc_ms__a21boi_1.netlist.tsv b/cells/a21boi/sky130_fd_sc_ms__a21boi_1.netlist.tsv
index a678d29..f949037 100644
--- a/cells/a21boi/sky130_fd_sc_ms__a21boi_1.netlist.tsv
+++ b/cells/a21boi/sky130_fd_sc_ms__a21boi_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	net28	A1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	net28	A2	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	net28	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	net28	A1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	net28	A2	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	net28	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21boi/sky130_fd_sc_ms__a21boi_1.spice b/cells/a21boi/sky130_fd_sc_ms__a21boi_1.spice
index 879c233..2c2d8d0 100644
--- a/cells/a21boi/sky130_fd_sc_ms__a21boi_1.spice
+++ b/cells/a21boi/sky130_fd_sc_ms__a21boi_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__a21boi_1 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 a_437_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=2.368e+11p pd=2.12e+06u as=2.072e+11p ps=2.04e+06u
-M1001 VGND B1_N a_29_424# VNB nlowvt w=550000u l=150000u
-+  ad=5.5275e+11p pd=4.59e+06u as=1.4575e+11p ps=1.63e+06u
-M1002 a_351_368# a_29_424# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=5.936e+11p pd=5.54e+06u as=2.912e+11p ps=2.76e+06u
-M1003 a_351_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=5.544e+11p ps=5.04e+06u
-M1004 VPWR A1 a_351_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y a_29_424# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2 a_437_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B1_N a_29_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.184e+11p ps=2.2e+06u
+X0 Y a_29_424# a_351_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 Y A1 a_437_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VGND a_29_424# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR A2 a_351_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_29_424# B1_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 a_351_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_29_424# B1_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X7 a_437_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a21boi/sky130_fd_sc_ms__a21boi_2.cdl b/cells/a21boi/sky130_fd_sc_ms__a21boi_2.cdl
index 6309584..013d2e0 100644
--- a/cells/a21boi/sky130_fd_sc_ms__a21boi_2.cdl
+++ b/cells/a21boi/sky130_fd_sc_ms__a21boi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__a21boi_2 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 net28 A1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 net28 A1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 net28 A2 VPB pfet_01v8 m=2 w=1.12 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 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 net28 A2 VPB pshort m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pshort m=1 w=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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPB1N B1 B1_N VPB pfet_01v8 m=1 w=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_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8_lvt m=1 w=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_ms__a21boi_2
diff --git a/cells/a21boi/sky130_fd_sc_ms__a21boi_2.netlist.tsv b/cells/a21boi/sky130_fd_sc_ms__a21boi_2.netlist.tsv
index 969de9b..bc3e7e4 100644
--- a/cells/a21boi/sky130_fd_sc_ms__a21boi_2.netlist.tsv
+++ b/cells/a21boi/sky130_fd_sc_ms__a21boi_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__a21boi_2	A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	net28	A1	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	net28	A2	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	net28	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	net28	A1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	net28	A2	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	net28	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8	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_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21boi/sky130_fd_sc_ms__a21boi_2.spice b/cells/a21boi/sky130_fd_sc_ms__a21boi_2.spice
index e2afd92..f2265ab 100644
--- a/cells/a21boi/sky130_fd_sc_ms__a21boi_2.spice
+++ b/cells/a21boi/sky130_fd_sc_ms__a21boi_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__a21boi_2 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 a_436_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=5.994e+11p pd=6.06e+06u as=4.144e+11p ps=4.08e+06u
-M1001 Y a_62_94# a_241_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=1.1872e+12p ps=1.108e+07u
-M1002 a_241_368# a_62_94# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND B1_N a_62_94# VNB nlowvt w=640000u l=150000u
-+  ad=6.474e+11p pd=6.21e+06u as=1.696e+11p ps=1.81e+06u
-M1004 VPWR A1 a_241_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=8.872e+11p pd=8.12e+06u as=0p ps=0u
-M1005 a_241_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_62_94# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_436_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A2 a_241_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_241_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_62_94# B1_N VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
-M1011 VGND a_62_94# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A1 a_436_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_436_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_62_94# a_241_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VGND a_62_94# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VPWR A1 a_241_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VPWR B1_N a_62_94# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_436_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_62_94# B1_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VPWR A2 a_241_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y A1 a_436_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_241_368# a_62_94# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VGND A2 a_436_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_241_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_241_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 Y a_62_94# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_436_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a21boi/sky130_fd_sc_ms__a21boi_4.cdl b/cells/a21boi/sky130_fd_sc_ms__a21boi_4.cdl
index 2edb84c..2ccb6d1 100644
--- a/cells/a21boi/sky130_fd_sc_ms__a21boi_4.cdl
+++ b/cells/a21boi/sky130_fd_sc_ms__a21boi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__a21boi_4 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 net28 A1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 net28 A1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 net28 A2 VPB pfet_01v8 m=4 w=1.12 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 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 net28 A2 VPB pshort m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPB1N B1 B1_N VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a21boi_4
diff --git a/cells/a21boi/sky130_fd_sc_ms__a21boi_4.netlist.tsv b/cells/a21boi/sky130_fd_sc_ms__a21boi_4.netlist.tsv
index e50173b..4ba09c5 100644
--- a/cells/a21boi/sky130_fd_sc_ms__a21boi_4.netlist.tsv
+++ b/cells/a21boi/sky130_fd_sc_ms__a21boi_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__a21boi_4	A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	net28	A1	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	net28	A2	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	net28	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	net28	A1	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	net28	A2	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	net28	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21boi/sky130_fd_sc_ms__a21boi_4.spice b/cells/a21boi/sky130_fd_sc_ms__a21boi_4.spice
index 078a813..6b44e05 100644
--- a/cells/a21boi/sky130_fd_sc_ms__a21boi_4.spice
+++ b/cells/a21boi/sky130_fd_sc_ms__a21boi_4.spice
@@ -16,58 +16,31 @@
 
 
 .subckt sky130_fd_sc_ms__a21boi_4 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 VGND a_803_323# Y VNB nlowvt w=740000u l=150000u
-+  ad=1.0249e+12p pd=1.017e+07u as=8.288e+11p ps=8.16e+06u
-M1001 Y a_803_323# a_31_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=2.0944e+12p ps=1.942e+07u
-M1002 a_46_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.0138e+12p pd=1.014e+07u as=0p ps=0u
-M1003 a_46_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_803_323# B1_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1005 Y A1 a_46_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_46_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_31_368# a_803_323# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A1 a_31_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.6464e+12p pd=1.552e+07u as=0p ps=0u
-M1009 a_31_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1 a_31_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A2 a_46_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A2 a_46_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y a_803_323# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_31_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A1 a_46_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A2 a_31_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_803_323# B1_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1018 a_31_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR B1_N a_803_323# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A2 a_31_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y a_803_323# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_31_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_46_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_803_323# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y a_803_323# a_31_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_31_368# a_803_323# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_803_323# B1_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 Y a_803_323# a_31_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_46_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 Y a_803_323# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_46_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VPWR A1 a_31_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VPWR A1 a_31_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VPWR A2 a_31_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_46_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VGND a_803_323# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND A2 a_46_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VPWR A2 a_31_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 VPWR B1_N a_803_323# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X13 a_31_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_31_368# a_803_323# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 Y a_803_323# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 Y a_803_323# a_31_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 Y A1 a_46_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_31_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 Y A1 a_46_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_31_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 VGND a_803_323# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 VGND B1_N a_803_323# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_31_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_46_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 VGND A2 a_46_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 a_31_368# a_803_323# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/a21o/sky130_fd_sc_ms__a21o_1.cdl b/cells/a21o/sky130_fd_sc_ms__a21o_1.cdl
index 4ff0646..7b42fae 100644
--- a/cells/a21o/sky130_fd_sc_ms__a21o_1.cdl
+++ b/cells/a21o/sky130_fd_sc_ms__a21o_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 y B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=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 nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=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 nfet_01v8_lvt m=1 w=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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a21o_1
diff --git a/cells/a21o/sky130_fd_sc_ms__a21o_1.netlist.tsv b/cells/a21o/sky130_fd_sc_ms__a21o_1.netlist.tsv
index 7355b8f..f1853eb 100644
--- a/cells/a21o/sky130_fd_sc_ms__a21o_1.netlist.tsv
+++ b/cells/a21o/sky130_fd_sc_ms__a21o_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	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_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21o/sky130_fd_sc_ms__a21o_1.spice b/cells/a21o/sky130_fd_sc_ms__a21o_1.spice
index fe97ec7..818bd5b 100644
--- a/cells/a21o/sky130_fd_sc_ms__a21o_1.spice
+++ b/cells/a21o/sky130_fd_sc_ms__a21o_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__a21o_1 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 VGND a_81_264# X VNB nlowvt w=740000u l=150000u
-+  ad=4.541e+11p pd=4.09e+06u as=1.961e+11p ps=2.01e+06u
-M1001 VGND A2 a_452_136# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.93e+06u
-M1002 a_367_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.3e+11p pd=5.06e+06u as=5.912e+11p ps=5.36e+06u
-M1003 a_81_264# B1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1004 a_452_136# A1 a_81_264# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_81_264# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.912e+11p ps=2.76e+06u
-M1006 a_367_392# B1 a_81_264# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.6e+11p ps=2.52e+06u
-M1007 VPWR A1 a_367_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_367_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_81_264# A1 a_452_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 VPWR A2 a_367_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 a_81_264# B1 a_367_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 X a_81_264# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 X a_81_264# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_452_136# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X7 VGND B1 a_81_264# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/a21o/sky130_fd_sc_ms__a21o_2.cdl b/cells/a21o/sky130_fd_sc_ms__a21o_2.cdl
index 6ce1144..0c6567c 100644
--- a/cells/a21o/sky130_fd_sc_ms__a21o_2.cdl
+++ b/cells/a21o/sky130_fd_sc_ms__a21o_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 y B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a21o_2
diff --git a/cells/a21o/sky130_fd_sc_ms__a21o_2.netlist.tsv b/cells/a21o/sky130_fd_sc_ms__a21o_2.netlist.tsv
index a8be20e..2edaa35 100644
--- a/cells/a21o/sky130_fd_sc_ms__a21o_2.netlist.tsv
+++ b/cells/a21o/sky130_fd_sc_ms__a21o_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21o/sky130_fd_sc_ms__a21o_2.spice b/cells/a21o/sky130_fd_sc_ms__a21o_2.spice
index d8eab17..a1aa1e8 100644
--- a/cells/a21o/sky130_fd_sc_ms__a21o_2.spice
+++ b/cells/a21o/sky130_fd_sc_ms__a21o_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__a21o_2 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 a_404_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.3e+11p pd=5.06e+06u as=8.524e+11p ps=8.06e+06u
-M1001 X a_84_244# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1002 VPWR a_84_244# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_84_244# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=8.954e+11p ps=6.86e+06u
-M1004 a_84_244# B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1005 VGND a_84_244# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2 a_484_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.368e+11p ps=2.12e+06u
-M1007 a_404_392# B1 a_84_244# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.6e+11p ps=2.52e+06u
-M1008 a_484_74# A1 a_84_244# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_404_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_84_244# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VGND a_84_244# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_484_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_84_244# B1 a_404_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VPWR a_84_244# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VPWR A2 a_404_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 VGND B1 a_84_244# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_404_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 X a_84_244# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_84_244# A1 a_484_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a21o/sky130_fd_sc_ms__a21o_4.cdl b/cells/a21o/sky130_fd_sc_ms__a21o_4.cdl
index 4ea0a7d..14ff5c3 100644
--- a/cells/a21o/sky130_fd_sc_ms__a21o_4.cdl
+++ b/cells/a21o/sky130_fd_sc_ms__a21o_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 y B1 VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=2 w=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 nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=2 w=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 nfet_01v8_lvt m=2 w=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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a21o_4
diff --git a/cells/a21o/sky130_fd_sc_ms__a21o_4.netlist.tsv b/cells/a21o/sky130_fd_sc_ms__a21o_4.netlist.tsv
index 8bb9a8d..d8c58fd 100644
--- a/cells/a21o/sky130_fd_sc_ms__a21o_4.netlist.tsv
+++ b/cells/a21o/sky130_fd_sc_ms__a21o_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21o/sky130_fd_sc_ms__a21o_4.spice b/cells/a21o/sky130_fd_sc_ms__a21o_4.spice
index c66edb0..0762c68 100644
--- a/cells/a21o/sky130_fd_sc_ms__a21o_4.spice
+++ b/cells/a21o/sky130_fd_sc_ms__a21o_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__a21o_4 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 a_700_74# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=5.184e+11p pd=5.46e+06u as=1.011e+12p ps=9.9e+06u
-M1001 X a_91_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1002 a_503_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=1.06e+12p pd=1.012e+07u as=1.4248e+12p ps=1.338e+07u
-M1003 a_700_74# A1 a_91_48# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.584e+11p ps=3.68e+06u
-M1004 X a_91_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_91_48# B1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_91_48# B1 a_503_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1007 X a_91_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1008 VPWR a_91_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_503_392# B1 a_91_48# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_91_48# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_91_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_91_48# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A1 a_503_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_91_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A2 a_700_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_503_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_91_48# A1 a_700_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A2 a_503_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND B1 a_91_48# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_91_48# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 VGND A2 a_700_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_91_48# B1 a_503_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 X a_91_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR A1 a_503_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_91_48# A1 a_700_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 X a_91_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 X a_91_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VGND a_91_48# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_700_74# A1 a_91_48# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 X a_91_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_700_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 VGND a_91_48# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VPWR a_91_48# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_503_392# B1 a_91_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X15 a_503_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 VPWR a_91_48# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_503_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 VGND B1 a_91_48# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X19 VPWR A2 a_503_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/a21oi/sky130_fd_sc_ms__a21oi_1.cdl b/cells/a21oi/sky130_fd_sc_ms__a21oi_1.cdl
index 5787d96..4bb1b98 100644
--- a/cells/a21oi/sky130_fd_sc_ms__a21oi_1.cdl
+++ b/cells/a21oi/sky130_fd_sc_ms__a21oi_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 Y B1 VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a21oi_1
diff --git a/cells/a21oi/sky130_fd_sc_ms__a21oi_1.netlist.tsv b/cells/a21oi/sky130_fd_sc_ms__a21oi_1.netlist.tsv
index 555af6e..c36a75d 100644
--- a/cells/a21oi/sky130_fd_sc_ms__a21oi_1.netlist.tsv
+++ b/cells/a21oi/sky130_fd_sc_ms__a21oi_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__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	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21oi/sky130_fd_sc_ms__a21oi_1.spice b/cells/a21oi/sky130_fd_sc_ms__a21oi_1.spice
index c6c70c6..ad4919a 100644
--- a/cells/a21oi/sky130_fd_sc_ms__a21oi_1.spice
+++ b/cells/a21oi/sky130_fd_sc_ms__a21oi_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ms__a21oi_1 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 a_29_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=5.936e+11p pd=5.54e+06u as=3.36e+11p ps=2.84e+06u
-M1001 Y B1 a_29_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1002 Y A1 a_117_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=1.554e+11p ps=1.9e+06u
-M1003 VPWR A2 a_29_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=4.07e+11p pd=4.06e+06u as=0p ps=0u
-M1005 a_117_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VPWR A1 a_29_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VGND A2 a_117_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_29_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_29_368# B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_117_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a21oi/sky130_fd_sc_ms__a21oi_2.cdl b/cells/a21oi/sky130_fd_sc_ms__a21oi_2.cdl
index 6888e6f..a3766e8 100644
--- a/cells/a21oi/sky130_fd_sc_ms__a21oi_2.cdl
+++ b/cells/a21oi/sky130_fd_sc_ms__a21oi_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 Y B1 VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a21oi_2
diff --git a/cells/a21oi/sky130_fd_sc_ms__a21oi_2.netlist.tsv b/cells/a21oi/sky130_fd_sc_ms__a21oi_2.netlist.tsv
index d68f8b4..04405b0 100644
--- a/cells/a21oi/sky130_fd_sc_ms__a21oi_2.netlist.tsv
+++ b/cells/a21oi/sky130_fd_sc_ms__a21oi_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__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	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21oi/sky130_fd_sc_ms__a21oi_2.spice b/cells/a21oi/sky130_fd_sc_ms__a21oi_2.spice
index 0b33b57..ad1679c 100644
--- a/cells/a21oi/sky130_fd_sc_ms__a21oi_2.spice
+++ b/cells/a21oi/sky130_fd_sc_ms__a21oi_2.spice
@@ -16,26 +16,15 @@
 
 
 .subckt sky130_fd_sc_ms__a21oi_2 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 a_280_107# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=6.5505e+11p pd=6.27e+06u as=4.033e+11p ps=4.05e+06u
-M1001 a_280_107# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=5.83425e+11p ps=4.82e+06u
-M1002 VGND A2 a_280_107# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B1 a_131_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=1.1872e+12p ps=1.108e+07u
-M1004 a_131_368# B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A2 a_131_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1006 Y A1 a_280_107# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_131_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_131_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_131_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A1 a_280_107# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_280_107# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_131_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VGND B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 Y B1 a_131_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_280_107# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR A2 a_131_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VPWR A1 a_131_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_131_368# B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VGND A2 a_280_107# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_131_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/a21oi/sky130_fd_sc_ms__a21oi_4.cdl b/cells/a21oi/sky130_fd_sc_ms__a21oi_4.cdl
index ae6bcd3..7068e96 100644
--- a/cells/a21oi/sky130_fd_sc_ms__a21oi_4.cdl
+++ b/cells/a21oi/sky130_fd_sc_ms__a21oi_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 Y B1 VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a21oi_4
diff --git a/cells/a21oi/sky130_fd_sc_ms__a21oi_4.netlist.tsv b/cells/a21oi/sky130_fd_sc_ms__a21oi_4.netlist.tsv
index 28d4dea..fbc9d2e 100644
--- a/cells/a21oi/sky130_fd_sc_ms__a21oi_4.netlist.tsv
+++ b/cells/a21oi/sky130_fd_sc_ms__a21oi_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__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	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21oi/sky130_fd_sc_ms__a21oi_4.spice b/cells/a21oi/sky130_fd_sc_ms__a21oi_4.spice
index 449509a..8745060 100644
--- a/cells/a21oi/sky130_fd_sc_ms__a21oi_4.spice
+++ b/cells/a21oi/sky130_fd_sc_ms__a21oi_4.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ms__a21oi_4 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 Y A1 a_84_74# VNB nlowvt w=740000u l=150000u
-+  ad=8.066e+11p pd=8.1e+06u as=1.0286e+12p ps=1.018e+07u
-M1001 Y A1 a_84_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_84_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=6.216e+11p ps=6.12e+06u
-M1003 VPWR A2 a_69_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2096e+12p pd=1.112e+07u as=2.0944e+12p ps=1.942e+07u
-M1004 Y B1 a_69_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1005 a_69_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_69_368# B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A2 a_69_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_69_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_84_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_69_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_84_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_69_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A2 a_84_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_84_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A1 a_69_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A2 a_84_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_69_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B1 a_69_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_69_368# B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_69_368# B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_84_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 Y B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 Y B1 a_69_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_69_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VGND A2 a_84_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_69_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_84_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VPWR A2 a_69_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VGND A2 a_84_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 Y A1 a_84_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VPWR A1 a_69_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 VGND B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_84_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VPWR A1 a_69_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 Y A1 a_84_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 Y B1 a_69_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_84_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_69_368# B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 VPWR A2 a_69_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_69_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 a_69_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/a221o/sky130_fd_sc_ms__a221o_1.cdl b/cells/a221o/sky130_fd_sc_ms__a221o_1.cdl
index dfda8e5..32698e6 100644
--- a/cells/a221o/sky130_fd_sc_ms__a221o_1.cdl
+++ b/cells/a221o/sky130_fd_sc_ms__a221o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__a221o_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 pndB B2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 y C1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=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 nlowvt m=1 w=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 nlowvt m=1 w=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 nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=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 nfet_01v8_lvt m=1 w=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_lvt m=1 w=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 nfet_01v8_lvt m=1 w=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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a221o_1
diff --git a/cells/a221o/sky130_fd_sc_ms__a221o_1.netlist.tsv b/cells/a221o/sky130_fd_sc_ms__a221o_1.netlist.tsv
index 947e9c0..8316b7c 100644
--- a/cells/a221o/sky130_fd_sc_ms__a221o_1.netlist.tsv
+++ b/cells/a221o/sky130_fd_sc_ms__a221o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__a221o_1	A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	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	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	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_lvt	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_lvt	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_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221o/sky130_fd_sc_ms__a221o_1.spice b/cells/a221o/sky130_fd_sc_ms__a221o_1.spice
index ba3d88d..a0086cc 100644
--- a/cells/a221o/sky130_fd_sc_ms__a221o_1.spice
+++ b/cells/a221o/sky130_fd_sc_ms__a221o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__a221o_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 VPWR a_148_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=6.262e+11p pd=5.43e+06u as=2.912e+11p ps=2.76e+06u
-M1001 a_313_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=0p ps=0u
-M1002 VPWR A1 a_313_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_148_260# C1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=4.192e+11p pd=3.87e+06u as=8.64875e+11p ps=5.71e+06u
-M1004 a_417_79# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1005 a_148_260# A1 a_417_79# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_148_260# C1 a_509_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.6e+11p pd=2.52e+06u as=5.6e+11p ps=5.12e+06u
-M1007 VGND a_148_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.961e+11p ps=2.01e+06u
-M1008 a_597_79# B1 a_148_260# VNB nlowvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1009 VGND B2 a_597_79# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_313_392# B1 a_509_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_509_392# B2 a_313_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_148_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_509_392# C1 a_148_260# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VGND A2 a_417_79# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_509_392# B1 a_313_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_417_79# A1 a_148_260# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_148_260# B1 a_597_79# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 a_313_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_313_392# B2 a_509_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 VGND C1 a_148_260# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 X a_148_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_597_79# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 VPWR A2 a_313_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/a221o/sky130_fd_sc_ms__a221o_2.cdl b/cells/a221o/sky130_fd_sc_ms__a221o_2.cdl
index 5d8a0c5..ca83546 100644
--- a/cells/a221o/sky130_fd_sc_ms__a221o_2.cdl
+++ b/cells/a221o/sky130_fd_sc_ms__a221o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__a221o_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 pndB B2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 y C1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a221o_2
diff --git a/cells/a221o/sky130_fd_sc_ms__a221o_2.netlist.tsv b/cells/a221o/sky130_fd_sc_ms__a221o_2.netlist.tsv
index c6cd057..dd0bfca 100644
--- a/cells/a221o/sky130_fd_sc_ms__a221o_2.netlist.tsv
+++ b/cells/a221o/sky130_fd_sc_ms__a221o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__a221o_2	A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221o/sky130_fd_sc_ms__a221o_2.spice b/cells/a221o/sky130_fd_sc_ms__a221o_2.spice
index 06adfdf..35a6e75 100644
--- a/cells/a221o/sky130_fd_sc_ms__a221o_2.spice
+++ b/cells/a221o/sky130_fd_sc_ms__a221o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__a221o_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 VPWR A1 a_319_392# VPB pshort w=1e+06u l=180000u
-+  ad=9.174e+11p pd=8.19e+06u as=5.4e+11p ps=5.08e+06u
-M1001 a_89_260# A1 a_337_74# VNB nlowvt w=740000u l=150000u
-+  ad=8.029e+11p pd=5.13e+06u as=1.554e+11p ps=1.9e+06u
-M1002 X a_89_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=8.362e+11p ps=6.7e+06u
-M1003 VGND a_89_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_319_392# B1 a_515_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.3e+11p ps=5.06e+06u
-M1005 a_515_392# B2 a_319_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_89_260# C1 a_515_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
-M1007 a_337_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_603_74# B1 a_89_260# VNB nlowvt w=740000u l=150000u
-+  ad=1.554e+11p pd=1.9e+06u as=0p ps=0u
-M1009 VGND B2 a_603_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_89_260# C1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_89_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1012 VPWR a_89_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_319_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_515_392# C1 a_89_260# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 X a_89_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_603_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND C1 a_89_260# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR A2 a_319_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 X a_89_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_319_392# B2 a_515_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VGND A2 a_337_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_337_74# A1 a_89_260# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VGND a_89_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VPWR a_89_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_319_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 a_515_392# B1 a_319_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 a_89_260# B1 a_603_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a221o/sky130_fd_sc_ms__a221o_4.cdl b/cells/a221o/sky130_fd_sc_ms__a221o_4.cdl
index 1dbfc22..43db737 100644
--- a/cells/a221o/sky130_fd_sc_ms__a221o_4.cdl
+++ b/cells/a221o/sky130_fd_sc_ms__a221o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__a221o_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 pndB B2 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 y C1 VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=2 w=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 nlowvt m=2 w=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 nlowvt m=2 w=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 nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=2 w=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 nfet_01v8_lvt m=2 w=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_lvt m=2 w=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 nfet_01v8_lvt m=2 w=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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a221o_4
diff --git a/cells/a221o/sky130_fd_sc_ms__a221o_4.netlist.tsv b/cells/a221o/sky130_fd_sc_ms__a221o_4.netlist.tsv
index ea5fcf6..e003ee3 100644
--- a/cells/a221o/sky130_fd_sc_ms__a221o_4.netlist.tsv
+++ b/cells/a221o/sky130_fd_sc_ms__a221o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__a221o_4	A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221o/sky130_fd_sc_ms__a221o_4.spice b/cells/a221o/sky130_fd_sc_ms__a221o_4.spice
index 442e261..215be2c 100644
--- a/cells/a221o/sky130_fd_sc_ms__a221o_4.spice
+++ b/cells/a221o/sky130_fd_sc_ms__a221o_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__a221o_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 a_1102_392# C1 a_154_135# VPB pshort w=1e+06u l=180000u
-+  ad=1.35e+12p pd=1.07e+07u as=2.7e+11p ps=2.54e+06u
-M1001 a_160_376# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=1.24e+12p pd=1.048e+07u as=2.0298e+12p ps=1.459e+07u
-M1002 a_160_376# B2 a_1102_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A2 a_160_376# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_1102_392# B2 a_160_376# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_154_135# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=1.62282e+12p ps=1.315e+07u
-M1006 X a_154_135# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1007 a_160_376# B1 a_1102_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_154_135# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_154_135# A1 a_71_135# VNB nlowvt w=640000u l=150000u
-+  ad=5.376e+11p pd=5.52e+06u as=5.184e+11p ps=5.46e+06u
-M1010 X a_154_135# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_71_135# A1 a_154_135# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_154_135# B1 a_1346_123# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=5.632e+11p ps=5.6e+06u
-M1013 VPWR a_154_135# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1102_392# B1 a_160_376# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_154_135# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A1 a_160_376# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1346_123# B2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_160_376# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND B2 a_1346_123# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1346_123# B1 a_154_135# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_154_135# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_71_135# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_154_135# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_154_135# C1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND C1 a_154_135# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_154_135# C1 a_1102_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A2 a_71_135# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_154_135# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VGND a_154_135# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_154_135# A1 a_71_135# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_1346_123# B1 a_154_135# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_154_135# C1 a_1102_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_1102_392# B1 a_160_376# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 VGND A2 a_71_135# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X7 a_160_376# B2 a_1102_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 X a_154_135# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VGND B2 a_1346_123# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_160_376# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_154_135# B1 a_1346_123# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 VPWR A1 a_160_376# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 VGND C1 a_154_135# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 a_71_135# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 a_160_376# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 a_1346_123# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 a_1102_392# C1 a_154_135# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 a_154_135# C1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X19 a_1102_392# B2 a_160_376# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X20 VPWR a_154_135# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 VPWR A2 a_160_376# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X22 a_160_376# B1 a_1102_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X23 X a_154_135# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 VPWR a_154_135# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 a_71_135# A1 a_154_135# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X26 VGND a_154_135# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 X a_154_135# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/a221oi/sky130_fd_sc_ms__a221oi_1.cdl b/cells/a221oi/sky130_fd_sc_ms__a221oi_1.cdl
index 74b186f..662a596 100644
--- a/cells/a221oi/sky130_fd_sc_ms__a221oi_1.cdl
+++ b/cells/a221oi/sky130_fd_sc_ms__a221oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 pndB B2 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 Y C1 VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a221oi_1
diff --git a/cells/a221oi/sky130_fd_sc_ms__a221oi_1.netlist.tsv b/cells/a221oi/sky130_fd_sc_ms__a221oi_1.netlist.tsv
index 5df9974..3409700 100644
--- a/cells/a221oi/sky130_fd_sc_ms__a221oi_1.netlist.tsv
+++ b/cells/a221oi/sky130_fd_sc_ms__a221oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221oi/sky130_fd_sc_ms__a221oi_1.spice b/cells/a221oi/sky130_fd_sc_ms__a221oi_1.spice
index 0a42da2..209f740 100644
--- a/cells/a221oi/sky130_fd_sc_ms__a221oi_1.spice
+++ b/cells/a221oi/sky130_fd_sc_ms__a221oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__a221oi_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 Y B1 a_351_74# VNB nlowvt w=740000u l=150000u
-+  ad=8.695e+11p pd=5.31e+06u as=1.554e+11p ps=1.9e+06u
-M1001 a_121_368# B2 a_263_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=5.936e+11p pd=5.54e+06u as=9.184e+11p ps=8.36e+06u
-M1002 VPWR A1 a_263_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=4.032e+11p pd=2.96e+06u as=0p ps=0u
-M1003 VGND C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=4.847e+11p pd=4.27e+06u as=0p ps=0u
-M1004 a_263_368# B1 a_121_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_263_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_567_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=1.554e+11p pd=1.9e+06u as=0p ps=0u
-M1007 VGND A2 a_567_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_351_74# B2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_121_368# C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.912e+11p ps=2.76e+06u
+X0 Y C1 a_121_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_263_368# B2 a_121_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y A1 a_567_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 Y C1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR A2 a_263_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VGND B2 a_351_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_351_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_567_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_263_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_121_368# B1 a_263_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/a221oi/sky130_fd_sc_ms__a221oi_2.cdl b/cells/a221oi/sky130_fd_sc_ms__a221oi_2.cdl
index c4bf3ff..e39828f 100644
--- a/cells/a221oi/sky130_fd_sc_ms__a221oi_2.cdl
+++ b/cells/a221oi/sky130_fd_sc_ms__a221oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 pndB B2 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 Y C1 VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a221oi_2
diff --git a/cells/a221oi/sky130_fd_sc_ms__a221oi_2.netlist.tsv b/cells/a221oi/sky130_fd_sc_ms__a221oi_2.netlist.tsv
index efcc30c..dab12c3 100644
--- a/cells/a221oi/sky130_fd_sc_ms__a221oi_2.netlist.tsv
+++ b/cells/a221oi/sky130_fd_sc_ms__a221oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221oi/sky130_fd_sc_ms__a221oi_2.spice b/cells/a221oi/sky130_fd_sc_ms__a221oi_2.spice
index 15ce333..02a69ff 100644
--- a/cells/a221oi/sky130_fd_sc_ms__a221oi_2.spice
+++ b/cells/a221oi/sky130_fd_sc_ms__a221oi_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__a221oi_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 a_297_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2432e+12p pd=1.118e+07u as=8.848e+11p ps=8.3e+06u
-M1001 VGND B2 a_293_74# VNB nlowvt w=740000u l=150000u
-+  ad=7.696e+11p pd=6.52e+06u as=4.44e+11p ps=4.16e+06u
-M1002 VPWR A2 a_297_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_293_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=8.362e+11p ps=8.18e+06u
-M1004 a_675_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=7.03e+11p pd=4.86e+06u as=0p ps=0u
-M1005 a_297_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A1 a_675_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_675_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_293_74# B2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_297_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_29_368# B2 a_297_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.1872e+12p pd=1.108e+07u as=0p ps=0u
-M1011 a_297_368# B2 a_29_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_29_368# B1 a_297_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_675_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B1 a_293_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y C1 a_29_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1017 a_29_368# C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_297_368# B1 a_29_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_29_368# B2 a_297_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_293_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_29_368# B1 a_297_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_675_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR A1 a_297_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VPWR A2 a_297_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_297_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y A1 a_675_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VGND C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_297_368# B2 a_29_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 Y C1 a_29_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 Y C1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 Y B1 a_293_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_297_368# B1 a_29_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_297_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_293_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 VGND B2 a_293_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_675_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 VGND A2 a_675_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_29_368# C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/a221oi/sky130_fd_sc_ms__a221oi_4.cdl b/cells/a221oi/sky130_fd_sc_ms__a221oi_4.cdl
index 436647a..810213d 100644
--- a/cells/a221oi/sky130_fd_sc_ms__a221oi_4.cdl
+++ b/cells/a221oi/sky130_fd_sc_ms__a221oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 pndB B2 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 Y C1 VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a221oi_4
diff --git a/cells/a221oi/sky130_fd_sc_ms__a221oi_4.netlist.tsv b/cells/a221oi/sky130_fd_sc_ms__a221oi_4.netlist.tsv
index 10b9f81..46f260a 100644
--- a/cells/a221oi/sky130_fd_sc_ms__a221oi_4.netlist.tsv
+++ b/cells/a221oi/sky130_fd_sc_ms__a221oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221oi/sky130_fd_sc_ms__a221oi_4.spice b/cells/a221oi/sky130_fd_sc_ms__a221oi_4.spice
index f7e5b27..b134309 100644
--- a/cells/a221oi/sky130_fd_sc_ms__a221oi_4.spice
+++ b/cells/a221oi/sky130_fd_sc_ms__a221oi_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ms__a221oi_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 a_117_368# B1 a_531_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.8144e+12p pd=1.668e+07u as=2.6992e+12p ps=2.498e+07u
-M1001 VGND A2 a_534_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.2432e+12p pd=1.224e+07u as=1.0138e+12p ps=1.014e+07u
-M1002 VPWR A2 a_531_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.4672e+12p pd=1.158e+07u as=0p ps=0u
-M1003 a_531_368# B1 a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_1326_74# B2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.0138e+12p pd=1.014e+07u as=0p ps=0u
-M1005 VGND A2 a_534_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND B2 a_1326_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_531_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_117_368# B1 a_531_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1326_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.4282e+12p ps=1.422e+07u
-M1010 a_534_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A2 a_531_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_531_368# B1 a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1326_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_531_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_117_368# B2 a_531_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A1 a_531_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_534_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_531_368# B2 a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_534_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1326_74# B2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y C1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND B2 a_1326_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_117_368# B2 a_531_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A1 a_534_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y C1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y B1 a_1326_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_531_368# B2 a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_531_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A1 a_531_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_117_368# C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=8.848e+11p ps=8.3e+06u
-M1032 Y C1 a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y A1 a_534_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_534_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_117_368# C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y B1 a_1326_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Y C1 a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_531_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_534_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 Y B1 a_1326_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 Y C1 a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_531_368# B1 a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_1326_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_531_368# B1 a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 Y A1 a_534_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_1326_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VPWR A2 a_531_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VGND B2 a_1326_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_531_368# B2 a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VPWR A2 a_531_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_117_368# B2 a_531_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_1326_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 Y A1 a_534_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_117_368# B2 a_531_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VGND B2 a_1326_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_534_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_531_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_117_368# C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 VGND C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 VPWR A1 a_531_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_534_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_534_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_117_368# C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 a_117_368# B1 a_531_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 VGND C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 a_531_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 VGND A2 a_534_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_1326_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X30 a_117_368# B1 a_531_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X31 a_531_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 Y C1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 VGND A2 a_534_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 a_531_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X35 a_531_368# B2 a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X36 Y C1 a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X37 Y C1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X38 VPWR A1 a_531_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X39 Y B1 a_1326_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a222o/sky130_fd_sc_ms__a222o_1.cdl b/cells/a222o/sky130_fd_sc_ms__a222o_1.cdl
index ac33b6b..523f9e0 100644
--- a/cells/a222o/sky130_fd_sc_ms__a222o_1.cdl
+++ b/cells/a222o/sky130_fd_sc_ms__a222o_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ms__a222o_1 A1 A2 B1 B2 C1 C2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I C2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 pndB B2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 y C1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 y C2 VPB pshort m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 y C2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=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 nfet_01v8_lvt m=1 w=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_lvt m=1 w=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 nfet_01v8_lvt m=1 w=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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=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 nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net113 C2 VNB nlowvt m=1 w=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 net113 C2 VNB nfet_01v8_lvt m=1 w=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_ms__a222o_1
diff --git a/cells/a222o/sky130_fd_sc_ms__a222o_1.netlist.tsv b/cells/a222o/sky130_fd_sc_ms__a222o_1.netlist.tsv
index 4776cdd..f5f009c 100644
--- a/cells/a222o/sky130_fd_sc_ms__a222o_1.netlist.tsv
+++ b/cells/a222o/sky130_fd_sc_ms__a222o_1.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ms__a222o_1	A1:I A2:I B1:I B2:I C1:I C2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	y	C2	pndB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	net113	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net113	C2	VGND	VNB	nlowvt	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	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	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	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	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	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	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	y	C2	pndB	VPB	pfet_01v8	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_lvt	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_lvt	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_lvt	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_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	net113	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net113	C2	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a222o/sky130_fd_sc_ms__a222o_1.spice b/cells/a222o/sky130_fd_sc_ms__a222o_1.spice
index 375831b..dc12b5a 100644
--- a/cells/a222o/sky130_fd_sc_ms__a222o_1.spice
+++ b/cells/a222o/sky130_fd_sc_ms__a222o_1.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__a222o_1 A1 A2 B1 B2 C1 C2 VGND VNB VPB VPWR X
-M1000 VGND C2 a_119_74# VNB nlowvt w=640000u l=150000u
-+  ad=9.082e+11p pd=5.52e+06u as=1.536e+11p ps=1.76e+06u
-M1001 a_32_74# C1 a_27_390# VPB pshort w=1e+06u l=180000u
-+  ad=4.25e+11p pd=2.85e+06u as=8.8e+11p ps=7.76e+06u
-M1002 X a_32_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1003 VGND A2 a_651_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1004 a_651_74# A1 a_32_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=6.848e+11p ps=4.7e+06u
-M1005 a_119_74# C1 a_32_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_386_74# B2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1007 a_32_74# B1 a_386_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_340_390# B2 a_27_390# VPB pshort w=1e+06u l=180000u
-+  ad=6.8e+11p pd=5.36e+06u as=0p ps=0u
-M1009 a_27_390# C2 a_32_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_390# B1 a_340_390# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_340_390# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=7.686e+11p ps=5.71e+06u
-M1012 VPWR A2 a_340_390# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_32_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
+X0 a_340_390# B1 a_27_390# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VPWR a_32_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_651_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_27_390# B2 a_340_390# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_119_74# C2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_32_74# C1 a_119_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VPWR A1 a_340_390# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_32_74# A1 a_651_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 VGND a_32_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_386_74# B1 a_32_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_32_74# C2 a_27_390# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 VGND B2 a_386_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 a_27_390# C1 a_32_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 a_340_390# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/a222o/sky130_fd_sc_ms__a222o_2.cdl b/cells/a222o/sky130_fd_sc_ms__a222o_2.cdl
index 95729ad..6531977 100644
--- a/cells/a222o/sky130_fd_sc_ms__a222o_2.cdl
+++ b/cells/a222o/sky130_fd_sc_ms__a222o_2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ms__a222o_2 A1 A2 B1 B2 C1 C2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I C2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 pndB B2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 y C1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 y C2 VPB pshort m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 y C2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=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 nfet_01v8_lvt m=1 w=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_lvt m=1 w=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 nfet_01v8_lvt m=1 w=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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=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 nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net113 C2 VNB nlowvt m=1 w=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 net113 C2 VNB nfet_01v8_lvt m=1 w=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_ms__a222o_2
diff --git a/cells/a222o/sky130_fd_sc_ms__a222o_2.netlist.tsv b/cells/a222o/sky130_fd_sc_ms__a222o_2.netlist.tsv
index fb8e532..37e1684 100644
--- a/cells/a222o/sky130_fd_sc_ms__a222o_2.netlist.tsv
+++ b/cells/a222o/sky130_fd_sc_ms__a222o_2.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ms__a222o_2	A1:I A2:I B1:I B2:I C1:I C2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	y	C2	pndB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	net113	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net113	C2	VGND	VNB	nlowvt	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	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	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	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	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	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	y	C2	pndB	VPB	pfet_01v8	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_lvt	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_lvt	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_lvt	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_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	net113	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net113	C2	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a222o/sky130_fd_sc_ms__a222o_2.spice b/cells/a222o/sky130_fd_sc_ms__a222o_2.spice
index bfe9d74..ac44544 100644
--- a/cells/a222o/sky130_fd_sc_ms__a222o_2.spice
+++ b/cells/a222o/sky130_fd_sc_ms__a222o_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ms__a222o_2 A1 A2 B1 B2 C1 C2 VGND VNB VPB VPWR X
-M1000 a_557_74# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=3.795e+11p pd=3.77e+06u as=9.428e+11p ps=7.49e+06u
-M1001 a_119_392# C1 a_27_82# VPB pshort w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=5.6e+11p ps=5.12e+06u
-M1002 a_27_82# C2 a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_642_368# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=9.035e+11p pd=6.05e+06u as=1.10505e+12p ps=8.89e+06u
-M1004 a_114_82# C1 a_27_82# VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=4.832e+11p ps=4.07e+06u
-M1005 X a_27_82# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1006 X a_27_82# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1007 a_27_82# A1 a_557_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_27_82# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A2 a_642_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_27_82# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_775_74# B1 a_27_82# VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1012 VGND B2 a_775_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_119_392# B1 a_642_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_642_368# B2 a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND C2 a_114_82# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_82# C1 a_114_82# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 a_775_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_642_368# B1 a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 VGND a_27_82# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_27_82# B1 a_775_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 VPWR a_27_82# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 X a_27_82# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VGND A2 a_557_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_642_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 a_119_392# C2 a_27_82# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_119_392# B2 a_642_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 X a_27_82# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_557_74# A1 a_27_82# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 a_27_82# C1 a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 VPWR A1 a_642_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X15 a_114_82# C2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/a222oi/sky130_fd_sc_ms__a222oi_1.cdl b/cells/a222oi/sky130_fd_sc_ms__a222oi_1.cdl
index aba3024..3e2c231 100644
--- a/cells/a222oi/sky130_fd_sc_ms__a222oi_1.cdl
+++ b/cells/a222oi/sky130_fd_sc_ms__a222oi_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 pndB B2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 Y C1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 Y C1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Y C2 VPB pshort m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 Y C2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=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 nlowvt m=1 w=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 nlowvt m=1 w=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 nlowvt m=1 w=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 net113 C2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=1 w=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 nfet_01v8_lvt m=1 w=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_lvt m=1 w=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 nfet_01v8_lvt m=1 w=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_lvt m=1 w=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 net113 C2 VNB nfet_01v8_lvt m=1 w=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_ms__a222oi_1
diff --git a/cells/a222oi/sky130_fd_sc_ms__a222oi_1.netlist.tsv b/cells/a222oi/sky130_fd_sc_ms__a222oi_1.netlist.tsv
index 6eddd8e..aa10797 100644
--- a/cells/a222oi/sky130_fd_sc_ms__a222oi_1.netlist.tsv
+++ b/cells/a222oi/sky130_fd_sc_ms__a222oi_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Y	C2	pndB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	net113	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net113	C2	VGND	VNB	nlowvt	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	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	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	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	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	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	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_lvt	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_lvt	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_lvt	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_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	net113	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net113	C2	VGND	VNB	nfet_01v8_lvt	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_ms__a222oi_1.spice b/cells/a222oi/sky130_fd_sc_ms__a222oi_1.spice
index 76b3590..50edb59 100644
--- a/cells/a222oi/sky130_fd_sc_ms__a222oi_1.spice
+++ b/cells/a222oi/sky130_fd_sc_ms__a222oi_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__a222oi_1 A1 A2 B1 B2 C1 C2 VGND VNB VPB VPWR Y
-M1000 VGND C2 a_119_74# VNB nlowvt w=640000u l=150000u
-+  ad=9.312e+11p pd=5.47e+06u as=1.536e+11p ps=1.76e+06u
-M1001 a_119_392# C1 Y VPB pshort w=1e+06u l=180000u
-+  ad=6.4e+11p pd=5.28e+06u as=6.1e+11p ps=5.22e+06u
-M1002 a_461_74# B2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1003 a_119_74# C1 Y VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=5.92e+11p ps=4.41e+06u
-M1004 Y B1 a_461_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A2 a_697_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1006 a_697_74# A1 Y VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_369_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=8.8e+11p pd=7.76e+06u as=4.2e+11p ps=2.84e+06u
-M1008 VPWR A1 a_369_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_119_392# B2 a_369_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_369_392# B1 a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y C2 a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_697_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 Y A1 a_697_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_119_392# C2 Y VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 VGND B2 a_461_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_119_74# C2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 Y C1 a_119_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 a_369_392# B2 a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VPWR A2 a_369_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_119_392# B1 a_369_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 a_461_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_369_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 Y C1 a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/a222oi/sky130_fd_sc_ms__a222oi_2.cdl b/cells/a222oi/sky130_fd_sc_ms__a222oi_2.cdl
index b9fc078..c6fc9a7 100644
--- a/cells/a222oi/sky130_fd_sc_ms__a222oi_2.cdl
+++ b/cells/a222oi/sky130_fd_sc_ms__a222oi_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__a222oi_2 A1 A2 B1 B2 C1 C2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I C2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 pndB B2 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 Y C1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Y C2 VPB pshort m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 Y C2 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=2 w=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 nlowvt m=2 w=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 nlowvt m=2 w=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 nlowvt m=2 w=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 net113 C2 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=2 w=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 nfet_01v8_lvt m=2 w=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_lvt m=2 w=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 nfet_01v8_lvt m=2 w=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_lvt m=2 w=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 net113 C2 VNB nfet_01v8_lvt m=2 w=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_ms__a222oi_2
diff --git a/cells/a222oi/sky130_fd_sc_ms__a222oi_2.netlist.tsv b/cells/a222oi/sky130_fd_sc_ms__a222oi_2.netlist.tsv
index 6b1898a..8171459 100644
--- a/cells/a222oi/sky130_fd_sc_ms__a222oi_2.netlist.tsv
+++ b/cells/a222oi/sky130_fd_sc_ms__a222oi_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__a222oi_2	A1:I A2:I B1:I B2:I C1:I C2:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Y	C2	pndB	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	net113	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net113	C2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Y	C2	pndB	VPB	pfet_01v8	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_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	net113	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net113	C2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a222oi/sky130_fd_sc_ms__a222oi_2.spice b/cells/a222oi/sky130_fd_sc_ms__a222oi_2.spice
index cd119be..d1e015b 100644
--- a/cells/a222oi/sky130_fd_sc_ms__a222oi_2.spice
+++ b/cells/a222oi/sky130_fd_sc_ms__a222oi_2.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__a222oi_2 A1 A2 B1 B2 C1 C2 VGND VNB VPB VPWR Y
-M1000 VGND A2 a_981_74# VNB nlowvt w=640000u l=150000u
-+  ad=1.01862e+12p pd=8.5e+06u as=4.032e+11p ps=3.82e+06u
-M1001 a_981_74# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_119_392# C2 Y VPB pshort w=1e+06u l=180000u
-+  ad=1.17e+12p pd=1.034e+07u as=9.1e+11p ps=7.82e+06u
-M1003 Y C1 a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_137_74# C1 Y VNB nlowvt w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=7.232e+11p ps=7.38e+06u
-M1005 a_981_74# A1 Y VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A1 a_981_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_119_392# B1 a_515_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.37e+12p ps=1.274e+07u
-M1008 VGND C2 a_137_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B2 a_593_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.584e+11p ps=3.68e+06u
-M1010 a_137_74# C2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y C1 a_137_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_515_392# B2 a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_119_392# B2 a_515_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_515_392# B1 a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_593_74# B2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_119_392# C1 Y VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A1 a_515_392# VPB pshort w=1e+06u l=180000u
-+  ad=5.7e+11p pd=5.14e+06u as=0p ps=0u
-M1018 Y C2 a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_515_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_593_74# B1 Y VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A2 a_515_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_515_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y B1 a_593_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND C2 a_137_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 VGND A2 a_981_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_515_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 a_137_74# C2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_515_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 Y A1 a_981_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 a_981_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X7 a_119_392# B2 a_515_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_981_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_119_392# C2 Y VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_119_392# C1 Y VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_119_392# B1 a_515_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 VPWR A2 a_515_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 VPWR A1 a_515_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 VGND B2 a_593_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 a_515_392# B1 a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 a_593_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 a_515_392# B2 a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 Y C1 a_137_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X19 Y C2 a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X20 Y B1 a_593_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X21 Y C1 a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X22 a_137_74# C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X23 a_593_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/a22o/sky130_fd_sc_ms__a22o_1.cdl b/cells/a22o/sky130_fd_sc_ms__a22o_1.cdl
index d64fab8..e295cd1 100644
--- a/cells/a22o/sky130_fd_sc_ms__a22o_1.cdl
+++ b/cells/a22o/sky130_fd_sc_ms__a22o_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 y B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=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 nlowvt m=1 w=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 nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=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 nfet_01v8_lvt m=1 w=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_lvt m=1 w=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 nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a22o_1
diff --git a/cells/a22o/sky130_fd_sc_ms__a22o_1.netlist.tsv b/cells/a22o/sky130_fd_sc_ms__a22o_1.netlist.tsv
index 2e9d167..e8d1388 100644
--- a/cells/a22o/sky130_fd_sc_ms__a22o_1.netlist.tsv
+++ b/cells/a22o/sky130_fd_sc_ms__a22o_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	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_lvt	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_lvt	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_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22o/sky130_fd_sc_ms__a22o_1.spice b/cells/a22o/sky130_fd_sc_ms__a22o_1.spice
index dbc1b31..6e90028 100644
--- a/cells/a22o/sky130_fd_sc_ms__a22o_1.spice
+++ b/cells/a22o/sky130_fd_sc_ms__a22o_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__a22o_1 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_225_392# B1 a_230_79# VNB nlowvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=1.344e+11p ps=1.7e+06u
-M1001 VGND A2 a_52_123# VNB nlowvt w=640000u l=150000u
-+  ad=4.426e+11p pd=4.38e+06u as=3.52e+11p ps=3.66e+06u
-M1002 X a_225_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=8.412e+11p ps=5.86e+06u
-M1003 a_230_79# B2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_135_392# B1 a_225_392# VPB pshort w=1e+06u l=180000u
-+  ad=6.3e+11p pd=5.26e+06u as=3e+11p ps=2.6e+06u
-M1005 a_135_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_225_392# B2 a_135_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_52_123# A1 a_225_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_225_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1009 VPWR A1 a_135_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_225_392# B1 a_135_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_135_392# B2 a_225_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_52_123# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 VPWR a_225_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_135_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 VGND a_225_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR A2 a_135_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VGND B2 a_230_79# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_225_392# A1 a_52_123# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_230_79# B1 a_225_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/a22o/sky130_fd_sc_ms__a22o_2.cdl b/cells/a22o/sky130_fd_sc_ms__a22o_2.cdl
index ee99915..c5efcfe 100644
--- a/cells/a22o/sky130_fd_sc_ms__a22o_2.cdl
+++ b/cells/a22o/sky130_fd_sc_ms__a22o_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 y B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a22o_2
diff --git a/cells/a22o/sky130_fd_sc_ms__a22o_2.netlist.tsv b/cells/a22o/sky130_fd_sc_ms__a22o_2.netlist.tsv
index 8892a93..c60e568 100644
--- a/cells/a22o/sky130_fd_sc_ms__a22o_2.netlist.tsv
+++ b/cells/a22o/sky130_fd_sc_ms__a22o_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22o/sky130_fd_sc_ms__a22o_2.spice b/cells/a22o/sky130_fd_sc_ms__a22o_2.spice
index 61dccea..4655131 100644
--- a/cells/a22o/sky130_fd_sc_ms__a22o_2.spice
+++ b/cells/a22o/sky130_fd_sc_ms__a22o_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__a22o_2 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_391_368# B2 a_81_48# VPB pshort w=1e+06u l=180000u
-+  ad=6.1e+11p pd=5.22e+06u as=3.2e+11p ps=2.64e+06u
-M1001 VPWR A2 a_391_368# VPB pshort w=1e+06u l=180000u
-+  ad=9.412e+11p pd=8.24e+06u as=0p ps=0u
-M1002 VGND a_81_48# X VNB nlowvt w=740000u l=150000u
-+  ad=6.808e+11p pd=6.28e+06u as=2.072e+11p ps=2.04e+06u
-M1003 a_81_48# B1 a_391_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_304_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.218e+11p pd=4.1e+06u as=0p ps=0u
-M1005 X a_81_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1006 a_491_74# B1 a_81_48# VNB nlowvt w=740000u l=150000u
-+  ad=1.85e+11p pd=1.98e+06u as=2.59e+11p ps=2.18e+06u
-M1007 VPWR a_81_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_81_48# A1 a_304_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_81_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_391_368# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B2 a_491_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_491_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VPWR a_81_48# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_391_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 X a_81_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VGND a_81_48# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_81_48# B1 a_491_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_391_368# B1 a_81_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_304_74# A1 a_81_48# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 X a_81_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_81_48# B2 a_391_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 VGND A2 a_304_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VPWR A1 a_391_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/a22o/sky130_fd_sc_ms__a22o_4.cdl b/cells/a22o/sky130_fd_sc_ms__a22o_4.cdl
index a2cc32c..ed4ebc0 100644
--- a/cells/a22o/sky130_fd_sc_ms__a22o_4.cdl
+++ b/cells/a22o/sky130_fd_sc_ms__a22o_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 y B1 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=2 w=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 nlowvt m=2 w=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 nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=2 w=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 nfet_01v8_lvt m=2 w=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_lvt m=2 w=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 nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a22o_4
diff --git a/cells/a22o/sky130_fd_sc_ms__a22o_4.netlist.tsv b/cells/a22o/sky130_fd_sc_ms__a22o_4.netlist.tsv
index 08bf4c5..a80d440 100644
--- a/cells/a22o/sky130_fd_sc_ms__a22o_4.netlist.tsv
+++ b/cells/a22o/sky130_fd_sc_ms__a22o_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22o/sky130_fd_sc_ms__a22o_4.spice b/cells/a22o/sky130_fd_sc_ms__a22o_4.spice
index e84f20c..5d750a7 100644
--- a/cells/a22o/sky130_fd_sc_ms__a22o_4.spice
+++ b/cells/a22o/sky130_fd_sc_ms__a22o_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__a22o_4 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_645_120# B2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=3.89825e+11p pd=3.8e+06u as=1.217e+12p ps=1.055e+07u
-M1001 a_95_306# B1 a_645_120# VNB nlowvt w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=0p ps=0u
-M1002 a_1064_123# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=0p ps=0u
-M1003 a_95_306# A1 a_1064_123# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A1 a_555_392# VPB pshort w=1e+06u l=180000u
-+  ad=1.6398e+12p pd=1.381e+07u as=1.36e+12p ps=1.272e+07u
-M1005 X a_95_306# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1006 a_555_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_95_306# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_95_306# B2 a_555_392# VPB pshort w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=0p ps=0u
-M1009 X a_95_306# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1010 VPWR a_95_306# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_95_306# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_555_392# B1 a_95_306# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1064_123# A1 a_95_306# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_95_306# B1 a_555_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_95_306# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A2 a_555_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_95_306# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_645_120# B1 a_95_306# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_555_392# B2 a_95_306# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_95_306# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_555_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND B2 a_645_120# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A2 a_1064_123# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_95_306# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VGND A2 a_1064_123# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_1064_123# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_555_392# B2 a_95_306# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_95_306# B1 a_555_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_555_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_95_306# B2 a_555_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_95_306# B1 a_645_120# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_1064_123# A1 a_95_306# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_95_306# A1 a_1064_123# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 VGND a_95_306# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 X a_95_306# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 VPWR A2 a_555_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 VGND B2 a_645_120# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 X a_95_306# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 VGND a_95_306# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 X a_95_306# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_645_120# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X18 a_555_392# B1 a_95_306# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X19 a_645_120# B1 a_95_306# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X20 VPWR a_95_306# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 VPWR A1 a_555_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X22 X a_95_306# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_555_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/a22oi/sky130_fd_sc_ms__a22oi_1.cdl b/cells/a22oi/sky130_fd_sc_ms__a22oi_1.cdl
index 013fff3..f104be2 100644
--- a/cells/a22oi/sky130_fd_sc_ms__a22oi_1.cdl
+++ b/cells/a22oi/sky130_fd_sc_ms__a22oi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 Y B1 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 Y B2 VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a22oi_1
diff --git a/cells/a22oi/sky130_fd_sc_ms__a22oi_1.netlist.tsv b/cells/a22oi/sky130_fd_sc_ms__a22oi_1.netlist.tsv
index 2c18846..1aef9e1 100644
--- a/cells/a22oi/sky130_fd_sc_ms__a22oi_1.netlist.tsv
+++ b/cells/a22oi/sky130_fd_sc_ms__a22oi_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22oi/sky130_fd_sc_ms__a22oi_1.spice b/cells/a22oi/sky130_fd_sc_ms__a22oi_1.spice
index 7139c61..eaf5eb6 100644
--- a/cells/a22oi/sky130_fd_sc_ms__a22oi_1.spice
+++ b/cells/a22oi/sky130_fd_sc_ms__a22oi_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__a22oi_1 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 Y B1 a_159_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=1.554e+11p ps=1.9e+06u
-M1001 a_159_74# B2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=3.922e+11p ps=4.02e+06u
-M1002 VPWR A1 a_71_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=4.032e+11p pd=2.96e+06u as=9.184e+11p ps=8.36e+06u
-M1003 a_339_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=0p ps=0u
-M1004 Y B2 a_71_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1005 a_71_368# B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_71_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_339_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_71_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 Y A1 a_339_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 Y B1 a_71_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_339_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_159_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_71_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_71_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND B2 a_159_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a22oi/sky130_fd_sc_ms__a22oi_2.cdl b/cells/a22oi/sky130_fd_sc_ms__a22oi_2.cdl
index e625dfd..a6b601d 100644
--- a/cells/a22oi/sky130_fd_sc_ms__a22oi_2.cdl
+++ b/cells/a22oi/sky130_fd_sc_ms__a22oi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 Y B1 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 Y B2 VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a22oi_2
diff --git a/cells/a22oi/sky130_fd_sc_ms__a22oi_2.netlist.tsv b/cells/a22oi/sky130_fd_sc_ms__a22oi_2.netlist.tsv
index 84c2bdb..002978d 100644
--- a/cells/a22oi/sky130_fd_sc_ms__a22oi_2.netlist.tsv
+++ b/cells/a22oi/sky130_fd_sc_ms__a22oi_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22oi/sky130_fd_sc_ms__a22oi_2.spice b/cells/a22oi/sky130_fd_sc_ms__a22oi_2.spice
index 69b9bc0..45f93e6 100644
--- a/cells/a22oi/sky130_fd_sc_ms__a22oi_2.spice
+++ b/cells/a22oi/sky130_fd_sc_ms__a22oi_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ms__a22oi_2 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_66_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.4896e+12p pd=1.386e+07u as=9.52e+11p ps=6.18e+06u
-M1001 a_148_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=4.662e+11p ps=4.22e+06u
-M1002 Y A1 a_148_74# VNB nlowvt w=740000u l=150000u
-+  ad=7.918e+11p pd=6.58e+06u as=0p ps=0u
-M1003 Y B1 a_66_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.384e+11p pd=5.62e+06u as=0p ps=0u
-M1004 VGND A2 a_148_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_558_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=4.958e+11p pd=4.3e+06u as=0p ps=0u
-M1006 Y B1 a_558_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B2 a_558_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A1 a_66_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_66_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_66_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A2 a_66_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B2 a_66_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_148_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_558_74# B2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_66_368# B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B2 a_66_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR A1 a_66_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y B1 a_66_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Y B1 a_558_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_558_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_148_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_66_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_558_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VGND B2 a_558_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_66_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_66_368# B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VPWR A2 a_66_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_66_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_148_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 Y A1 a_148_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 VGND A2 a_148_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a22oi/sky130_fd_sc_ms__a22oi_4.cdl b/cells/a22oi/sky130_fd_sc_ms__a22oi_4.cdl
index afce033..fafc0cc 100644
--- a/cells/a22oi/sky130_fd_sc_ms__a22oi_4.cdl
+++ b/cells/a22oi/sky130_fd_sc_ms__a22oi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 Y B1 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 Y B2 VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a22oi_4
diff --git a/cells/a22oi/sky130_fd_sc_ms__a22oi_4.netlist.tsv b/cells/a22oi/sky130_fd_sc_ms__a22oi_4.netlist.tsv
index 3a9e1ac..cdb7508 100644
--- a/cells/a22oi/sky130_fd_sc_ms__a22oi_4.netlist.tsv
+++ b/cells/a22oi/sky130_fd_sc_ms__a22oi_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22oi/sky130_fd_sc_ms__a22oi_4.spice b/cells/a22oi/sky130_fd_sc_ms__a22oi_4.spice
index 1e9e43a..0bb68f3 100644
--- a/cells/a22oi/sky130_fd_sc_ms__a22oi_4.spice
+++ b/cells/a22oi/sky130_fd_sc_ms__a22oi_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ms__a22oi_4 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_45_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.6992e+12p pd=2.498e+07u as=1.4672e+12p ps=1.158e+07u
-M1001 a_48_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=1.0138e+12p pd=1.014e+07u as=8.288e+11p ps=8.16e+06u
-M1002 a_48_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B2 a_45_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2096e+12p pd=1.112e+07u as=0p ps=0u
-M1004 a_45_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B2 a_48_74# VNB nlowvt w=740000u l=150000u
-+  ad=8.288e+11p pd=8.16e+06u as=0p ps=0u
-M1006 Y B2 a_45_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_45_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B1 a_45_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_840_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=1.0138e+12p pd=1.014e+07u as=0p ps=0u
-M1010 a_48_74# B2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_45_368# B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A2 a_840_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_840_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_48_74# B2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A2 a_840_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y B1 a_45_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A1 a_840_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_45_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_45_368# B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A1 a_45_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A2 a_45_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_45_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_45_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y B1 a_48_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B1 a_48_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR A2 a_45_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y A1 a_840_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND B2 a_48_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_840_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_840_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR A1 a_45_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 a_48_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_840_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 Y B2 a_45_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Y A1 a_840_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VGND A2 a_840_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VPWR A1 a_45_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 Y B1 a_48_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_840_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 Y B2 a_45_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VPWR A2 a_45_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 Y A1 a_840_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VGND A2 a_840_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 Y B1 a_45_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 Y B1 a_45_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_840_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 VGND B2 a_48_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 VPWR A1 a_45_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_45_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 a_45_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 VGND B2 a_48_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_48_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 a_45_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_45_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_45_368# B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_48_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 a_45_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 a_48_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 a_45_368# B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 VPWR A2 a_45_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X29 a_45_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X30 a_840_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 a_48_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.cdl b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.cdl
index 926f9bb..de9f10f 100644
--- a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.cdl
+++ b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor0 inor A1_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inor VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inor VPB pshort m=1 w=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 pshort m=1 w=1.12 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 pshort m=1 w=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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNaoi20 y inor VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 y inor VPB pfet_01v8 m=1 w=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 m=1 w=1.12 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 pshort m=1 w=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 m=1 w=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 m=1 w=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 m=1 w=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 m=1 w=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_ms__a2bb2o_1
diff --git a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.netlist.tsv b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.netlist.tsv
index a77c269..c7e7be8 100644
--- a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.netlist.tsv
+++ b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__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	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inor	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inor	pmid	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inor	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inor	pmid	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pfet_01v8	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	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	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	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.spice b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.spice
index af44126..c92987b 100644
--- a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.spice
+++ b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__a2bb2o_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 VPWR a_93_264# X VPB pshort w=1.12e+06u l=180000u
-+  ad=6.662e+11p pd=5.51e+06u as=2.912e+11p ps=2.76e+06u
-M1001 a_261_392# A1_N VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.1e+11p pd=2.42e+06u as=0p ps=0u
-M1002 a_93_264# a_257_126# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=8.3095e+11p ps=6.71e+06u
-M1003 a_605_126# B2 a_93_264# VNB nlowvt w=640000u l=150000u
-+  ad=2.496e+11p pd=2.06e+06u as=0p ps=0u
-M1004 a_257_126# A1_N VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=0p ps=0u
-M1005 VGND A2_N a_257_126# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_93_264# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.961e+11p ps=2.01e+06u
-M1007 a_257_126# A2_N a_261_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
-M1008 VGND B1 a_605_126# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_533_392# a_257_126# a_93_264# VPB pshort w=1e+06u l=180000u
-+  ad=5.3e+11p pd=5.06e+06u as=2.6e+11p ps=2.52e+06u
-M1010 a_533_392# B1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B2 a_533_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1_N a_261_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 X a_93_264# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_261_392# A2_N a_257_126# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 VPWR B1 a_533_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_533_392# B2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 VGND A1_N a_257_126# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X6 VGND a_257_126# a_93_264# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X7 a_257_126# A2_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X8 a_605_126# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_93_264# a_257_126# a_533_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 X a_93_264# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_93_264# B2 a_605_126# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.cdl b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.cdl
index e096b7e..5a34ad8 100644
--- a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.cdl
+++ b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor0 inor A1_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inor VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inor VPB pshort m=1 w=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 pshort m=2 w=1.12 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 pshort m=1 w=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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNaoi20 y inor VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 y inor VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8 m=2 w=1.12 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 pshort m=1 w=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 m=1 w=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 m=1 w=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 m=1 w=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 m=1 w=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_ms__a2bb2o_2
diff --git a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.netlist.tsv b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.netlist.tsv
index 8e65f56..332740b 100644
--- a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.netlist.tsv
+++ b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__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	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inor	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inor	pmid	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inor	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inor	pmid	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pfet_01v8	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	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	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	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.spice b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.spice
index ef2aa0a..bbee093 100644
--- a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.spice
+++ b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__a2bb2o_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 X a_221_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=9.212e+11p ps=8.2e+06u
-M1001 X a_221_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=1.184e+12p ps=9.5e+06u
-M1002 VPWR a_221_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_221_74# B2 a_149_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=1.554e+11p ps=1.9e+06u
-M1004 a_293_333# A2_N VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=0p ps=0u
-M1005 VPWR B1 a_61_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.3e+11p ps=5.06e+06u
-M1006 VGND a_293_333# a_221_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_149_74# B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_221_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_61_392# B2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1_N a_549_378# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.1e+11p ps=2.42e+06u
-M1011 VGND A1_N a_293_333# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_221_74# a_293_333# a_61_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
-M1013 a_549_378# A2_N a_293_333# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.6e+11p ps=2.52e+06u
+X0 VPWR B2 a_61_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_61_392# a_293_333# a_221_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 X a_221_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_149_74# B2 a_221_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_61_392# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_549_378# A1_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 VGND A2_N a_293_333# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X7 VPWR a_221_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_293_333# A1_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X9 X a_221_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_293_333# A2_N a_549_378# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 VGND B1 a_149_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VGND a_221_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_221_74# a_293_333# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.cdl b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.cdl
index 1a5bbc0..767c61e 100644
--- a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.cdl
+++ b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor0 inor A1_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inor VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inor VPB pshort m=2 w=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 pshort m=4 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA1N A2_N VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MMNaoi20 y inor VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPaoi20 y inor VPB pfet_01v8 m=2 w=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 m=4 w=1.12 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 pshort m=2 w=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 m=1 w=1.12 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 m=1 w=1.12 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 m=2 w=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 m=2 w=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_ms__a2bb2o_4
diff --git a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.netlist.tsv b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.netlist.tsv
index 4e7ae59..af4420c 100644
--- a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.netlist.tsv
+++ b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__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	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inor	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inor	pmid	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pshort	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_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inor	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inor	pmid	VPB	pfet_01v8	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8	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	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_ms__a2bb2o_4.spice b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.spice
index 1e648be..07b805e 100644
--- a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.spice
+++ b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.spice
@@ -16,50 +16,27 @@
 
 
 .subckt sky130_fd_sc_ms__a2bb2o_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 VGND a_162_48# X VNB nlowvt w=740000u l=150000u
-+  ad=1.6403e+12p pd=1.199e+07u as=4.144e+11p ps=4.08e+06u
-M1001 a_1009_74# B2 a_162_48# VNB nlowvt w=640000u l=150000u
-+  ad=5.184e+11p pd=5.46e+06u as=3.753e+11p ps=3.85e+06u
-M1002 a_586_368# A1_N VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.352e+11p pd=2.66e+06u as=1.5368e+12p ps=1.358e+07u
-M1003 a_162_48# a_586_94# a_820_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=1.06e+12p ps=1.012e+07u
-M1004 a_820_392# a_586_94# a_162_48# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_1009_74# B1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_586_94# A2_N a_586_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1007 X a_162_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND B1 a_1009_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B2 a_820_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_162_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_162_48# B2 a_1009_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_162_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1013 a_820_392# B2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_586_94# A1_N VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1015 VPWR B1 a_820_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_162_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_162_48# a_586_94# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_162_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_820_392# B1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_162_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_162_48# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A2_N a_586_94# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_162_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_586_94# A2_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 VGND a_162_48# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_162_48# B2 a_1009_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_820_392# a_586_94# a_162_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 VPWR A1_N a_586_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_1009_74# B2 a_162_48# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X7 X a_162_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VPWR B2 a_820_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 VPWR a_162_48# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 VGND a_586_94# a_162_48# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_1009_74# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 VPWR B1 a_820_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 VPWR a_162_48# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VGND B1 a_1009_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 a_162_48# a_586_94# a_820_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 a_820_392# B2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X17 VGND A1_N a_586_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X18 X a_162_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_820_392# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X20 X a_162_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 a_586_368# A2_N a_586_94# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 VGND a_162_48# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.cdl b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.cdl
index 6cb5882..1404268 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.cdl
+++ b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inor VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A1_N VPB pshort m=1 w=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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB pshort m=1 w=1.12 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 pshort m=1 w=1.12 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 pshort m=1 w=1.12 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 nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A1_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA1N A2_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPB pfet_01v8 m=1 w=1.12 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 m=1 w=1.12 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 m=1 w=1.12 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_ms__a2bb2oi_1
diff --git a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.netlist.tsv b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.netlist.tsv
index 77a43c1..c1ca866 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.netlist.tsv
+++ b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inor	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inor	pmid	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inor	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pfet_01v8	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	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	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inor	pmid	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.spice b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.spice
index 9ae2339..cfa5bb0 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.spice
+++ b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__a2bb2oi_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 a_126_112# A1_N VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=8.322e+11p ps=6.72e+06u
-M1001 Y a_126_112# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1002 a_126_112# A2_N a_120_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.6e+11p pd=2.52e+06u as=2.1e+11p ps=2.42e+06u
-M1003 VGND B1 a_488_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.368e+11p ps=2.12e+06u
-M1004 a_402_368# a_126_112# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=5.936e+11p pd=5.54e+06u as=2.912e+11p ps=2.76e+06u
-M1005 a_402_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=5.96e+11p ps=5.36e+06u
-M1006 VPWR B2 a_402_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_488_74# B2 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_120_392# A1_N VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2_N a_126_112# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_120_392# A2_N a_126_112# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 Y a_126_112# a_402_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y B2 a_488_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND A1_N a_126_112# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X4 VGND a_126_112# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_126_112# A2_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X6 VPWR A1_N a_120_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VPWR B1 a_402_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_402_368# B2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_488_74# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.cdl b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.cdl
index 846dac7..73a21bb 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.cdl
+++ b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inor VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A1_N VPB pshort m=1 w=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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A1_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA1N A2_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPB pfet_01v8 m=2 w=1.12 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 m=2 w=1.12 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 m=2 w=1.12 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_ms__a2bb2oi_2
diff --git a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.netlist.tsv b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.netlist.tsv
index d8dd7dd..3570974 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.netlist.tsv
+++ b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inor	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inor	pmid	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inor	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pfet_01v8	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	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inor	pmid	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.spice b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.spice
index 48bee88..5e0b91e 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.spice
+++ b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ms__a2bb2oi_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 Y B2 a_615_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=5.994e+11p ps=6.06e+06u
-M1001 a_212_392# A1_N VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.1e+11p pd=2.42e+06u as=8.648e+11p ps=8.08e+06u
-M1002 Y a_212_102# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=8.17e+11p ps=8.02e+06u
-M1003 Y a_212_102# a_424_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=1.1872e+12p ps=1.108e+07u
-M1004 a_424_368# a_212_102# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_615_74# B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_615_74# B2 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2_N a_212_102# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.93e+06u
-M1008 VPWR B2 a_424_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_424_368# B2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR B1 a_424_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_212_102# A1_N VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_212_102# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_424_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B1 a_615_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_212_102# A2_N a_212_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
+X0 a_615_74# B2 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_212_392# A2_N a_212_102# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VGND a_212_102# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 Y B2 a_615_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_424_368# a_212_102# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_424_368# B2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_424_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND B1 a_615_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 Y a_212_102# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_615_74# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_212_102# A2_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 Y a_212_102# a_424_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 VPWR B2 a_424_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VGND A1_N a_212_102# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 VPWR B1 a_424_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 VPWR A1_N a_212_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.cdl b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.cdl
index 5bf111d..6687fff 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.cdl
+++ b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inor VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A1_N VPB pshort m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB pshort m=4 w=1.12 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 pshort m=4 w=1.12 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 pshort m=4 w=1.12 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 nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A1_N VPB pfet_01v8 m=2 w=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 m=2 w=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 m=4 w=1.12 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 m=4 w=1.12 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 m=4 w=1.12 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_ms__a2bb2oi_4
diff --git a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.netlist.tsv b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.netlist.tsv
index 70b7035..1ef8527 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.netlist.tsv
+++ b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inor	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inor	pmid	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inor	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pfet_01v8	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	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inor	pmid	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.spice b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.spice
index 9b8a489..7d4ee95 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.spice
+++ b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_ms__a2bb2oi_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 a_914_74# B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.0138e+12p pd=1.014e+07u as=1.2654e+12p ps=1.23e+07u
-M1001 Y B2 a_914_74# VNB nlowvt w=740000u l=150000u
-+  ad=8.288e+11p pd=8.16e+06u as=0p ps=0u
-M1002 a_539_368# B2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.0944e+12p pd=1.942e+07u as=1.4796e+12p ps=1.366e+07u
-M1003 VGND a_117_392# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y a_117_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR B2 a_539_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A1_N a_117_392# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1007 a_539_368# B2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B1 a_539_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B2 a_914_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_539_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B1 a_914_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_914_74# B2 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_914_74# B2 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_117_392# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y a_117_392# a_539_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1016 VPWR B1 a_539_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_117_392# A2_N a_29_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=7.9e+11p ps=7.58e+06u
-M1018 a_29_392# A2_N a_117_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_539_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A1_N a_29_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_539_368# a_117_392# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_29_392# A1_N VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y a_117_392# a_539_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_539_368# a_117_392# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND B1 a_914_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR B2 a_539_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_117_392# A2_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y a_117_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_914_74# B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B2 a_539_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_914_74# B2 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VPWR B2 a_539_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Y B2 a_914_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VGND B1 a_914_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VPWR B1 a_539_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VGND a_117_392# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_539_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 Y B2 a_914_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VGND B1 a_914_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 Y a_117_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_29_392# A2_N a_117_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 Y a_117_392# a_539_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_914_74# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 Y a_117_392# a_539_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 Y a_117_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_29_392# A1_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X17 a_914_74# B2 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_914_74# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_539_368# B2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_539_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 VGND a_117_392# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 VGND A2_N a_117_392# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_539_368# a_117_392# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 VPWR B1 a_539_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 a_539_368# a_117_392# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 a_117_392# A2_N a_29_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X27 a_539_368# B2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 a_117_392# A1_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 VPWR A1_N a_29_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/a311o/sky130_fd_sc_ms__a311o_1.cdl b/cells/a311o/sky130_fd_sc_ms__a311o_1.cdl
index a58ae0c..d811682 100644
--- a/cells/a311o/sky130_fd_sc_ms__a311o_1.cdl
+++ b/cells/a311o/sky130_fd_sc_ms__a311o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__a311o_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 y C1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=1 w=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 nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=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 nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=1 w=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_lvt m=1 w=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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a311o_1
diff --git a/cells/a311o/sky130_fd_sc_ms__a311o_1.netlist.tsv b/cells/a311o/sky130_fd_sc_ms__a311o_1.netlist.tsv
index 9e52eb6..a869aba 100644
--- a/cells/a311o/sky130_fd_sc_ms__a311o_1.netlist.tsv
+++ b/cells/a311o/sky130_fd_sc_ms__a311o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__a311o_1	A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	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	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a311o/sky130_fd_sc_ms__a311o_1.spice b/cells/a311o/sky130_fd_sc_ms__a311o_1.spice
index c23ab5b..e4b0d52 100644
--- a/cells/a311o/sky130_fd_sc_ms__a311o_1.spice
+++ b/cells/a311o/sky130_fd_sc_ms__a311o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__a311o_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 a_261_392# A3 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=8.9e+11p ps=5.96e+06u
-M1001 VGND B1 a_89_270# VNB nlowvt w=640000u l=150000u
-+  ad=5.289e+11p pd=4.33e+06u as=3.488e+11p ps=3.65e+06u
-M1002 VPWR A2 a_261_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_89_270# C1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_264_120# A3 VGND VNB nlowvt w=640000u l=150000u
-+  ad=2.10625e+11p pd=1.96e+06u as=0p ps=0u
-M1005 a_89_270# C1 a_549_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.6e+11p pd=2.52e+06u as=2.1e+11p ps=2.42e+06u
-M1006 VGND a_89_270# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.961e+11p ps=2.01e+06u
-M1007 a_89_270# A1 a_359_123# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.048e+11p ps=1.92e+06u
-M1008 a_261_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_549_392# B1 a_261_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_89_270# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.912e+11p ps=2.76e+06u
-M1011 a_359_123# A2 a_264_120# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A3 a_261_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_549_392# C1 a_89_270# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VGND A3 a_264_120# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_89_270# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_359_123# A1 a_89_270# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_264_120# A2 a_359_123# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 a_261_392# B1 a_549_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 X a_89_270# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 X a_89_270# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_261_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 VGND C1 a_89_270# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 VPWR A1 a_261_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/a311o/sky130_fd_sc_ms__a311o_2.cdl b/cells/a311o/sky130_fd_sc_ms__a311o_2.cdl
index b38130e..87c15cd 100644
--- a/cells/a311o/sky130_fd_sc_ms__a311o_2.cdl
+++ b/cells/a311o/sky130_fd_sc_ms__a311o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__a311o_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 y C1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a311o_2
diff --git a/cells/a311o/sky130_fd_sc_ms__a311o_2.netlist.tsv b/cells/a311o/sky130_fd_sc_ms__a311o_2.netlist.tsv
index 6ffb2de..b369692 100644
--- a/cells/a311o/sky130_fd_sc_ms__a311o_2.netlist.tsv
+++ b/cells/a311o/sky130_fd_sc_ms__a311o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__a311o_2	A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a311o/sky130_fd_sc_ms__a311o_2.spice b/cells/a311o/sky130_fd_sc_ms__a311o_2.spice
index 3063998..d96e2b2 100644
--- a/cells/a311o/sky130_fd_sc_ms__a311o_2.spice
+++ b/cells/a311o/sky130_fd_sc_ms__a311o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__a311o_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 VPWR a_21_270# X VPB pshort w=1.12e+06u l=180000u
-+  ad=1.1724e+12p pd=8.7e+06u as=3.024e+11p ps=2.78e+06u
-M1001 a_423_74# A2 a_351_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=1.554e+11p ps=1.9e+06u
-M1002 VGND a_21_270# X VNB nlowvt w=740000u l=150000u
-+  ad=7.955e+11p pd=6.59e+06u as=2.072e+11p ps=2.04e+06u
-M1003 a_663_392# B1 a_333_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=6e+11p ps=5.2e+06u
-M1004 VGND B1 a_21_270# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.847e+11p ps=4.27e+06u
-M1005 a_351_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_21_270# C1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_21_270# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A2 a_333_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_333_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_333_392# A3 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_21_270# A1 a_423_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_21_270# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_21_270# C1 a_663_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
+X0 VPWR A1 a_333_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_663_392# C1 a_21_270# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_333_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 VPWR A3 a_333_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VGND A3 a_351_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_333_392# B1 a_663_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 VPWR a_21_270# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_351_74# A2 a_423_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 X a_21_270# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_21_270# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND C1 a_21_270# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 X a_21_270# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VGND a_21_270# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_423_74# A1 a_21_270# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a311o/sky130_fd_sc_ms__a311o_4.cdl b/cells/a311o/sky130_fd_sc_ms__a311o_4.cdl
index bc0b3e3..5784c78 100644
--- a/cells/a311o/sky130_fd_sc_ms__a311o_4.cdl
+++ b/cells/a311o/sky130_fd_sc_ms__a311o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__a311o_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 y C1 VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=2 w=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 nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=2 w=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 nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=2 w=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_lvt m=2 w=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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a311o_4
diff --git a/cells/a311o/sky130_fd_sc_ms__a311o_4.netlist.tsv b/cells/a311o/sky130_fd_sc_ms__a311o_4.netlist.tsv
index bf6b34a..c19f82d 100644
--- a/cells/a311o/sky130_fd_sc_ms__a311o_4.netlist.tsv
+++ b/cells/a311o/sky130_fd_sc_ms__a311o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__a311o_4	A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a311o/sky130_fd_sc_ms__a311o_4.spice b/cells/a311o/sky130_fd_sc_ms__a311o_4.spice
index 0606ae3..5b16101 100644
--- a/cells/a311o/sky130_fd_sc_ms__a311o_4.spice
+++ b/cells/a311o/sky130_fd_sc_ms__a311o_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__a311o_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 a_157_392# C1 a_69_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=7.9e+11p ps=7.58e+06u
-M1001 a_69_392# C1 a_157_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND B1 a_157_392# VNB nlowvt w=640000u l=150000u
-+  ad=1.23862e+12p pd=1.191e+07u as=5.376e+11p ps=5.52e+06u
-M1003 VGND a_157_392# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1004 VPWR A3 a_337_392# VPB pshort w=1e+06u l=180000u
-+  ad=1.7898e+12p pd=1.611e+07u as=1.08e+12p ps=1.016e+07u
-M1005 a_337_392# B1 a_69_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_337_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_157_392# A1 a_1081_39# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=6.927e+11p ps=6.48e+06u
-M1008 a_337_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1081_39# A1 a_157_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1 a_337_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A2 a_337_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_69_392# B1 a_337_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_157_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_888_105# A3 VGND VNB nlowvt w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=0p ps=0u
-M1015 a_1081_39# A2 a_888_105# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A3 a_888_105# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND C1 a_157_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_157_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_157_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1020 a_888_105# A2 a_1081_39# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_157_392# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_157_392# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_157_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_157_392# B1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_157_392# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_337_392# A3 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_157_392# C1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_337_392# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_157_392# A1 a_1081_39# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_157_392# C1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_157_392# C1 a_69_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VPWR A2 a_337_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 VGND a_157_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_337_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_888_105# A2 a_1081_39# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_1081_39# A2 a_888_105# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 VGND C1 a_157_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_888_105# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 X a_157_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VGND B1 a_157_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 VGND a_157_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 X a_157_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 VPWR a_157_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VPWR a_157_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_69_392# C1 a_157_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 VPWR A1 a_337_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X19 a_337_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X20 a_69_392# B1 a_337_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X21 a_337_392# B1 a_69_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X22 a_1081_39# A1 a_157_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X23 X a_157_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 VPWR A3 a_337_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X25 a_157_392# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X26 VGND A3 a_888_105# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X27 X a_157_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/a311oi/sky130_fd_sc_ms__a311oi_1.cdl b/cells/a311oi/sky130_fd_sc_ms__a311oi_1.cdl
index a32f0cc..884d9de 100644
--- a/cells/a311oi/sky130_fd_sc_ms__a311oi_1.cdl
+++ b/cells/a311oi/sky130_fd_sc_ms__a311oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__a311oi_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 Y C1 VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a311oi_1
diff --git a/cells/a311oi/sky130_fd_sc_ms__a311oi_1.netlist.tsv b/cells/a311oi/sky130_fd_sc_ms__a311oi_1.netlist.tsv
index 18b6dcd..4672bd8 100644
--- a/cells/a311oi/sky130_fd_sc_ms__a311oi_1.netlist.tsv
+++ b/cells/a311oi/sky130_fd_sc_ms__a311oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__a311oi_1	A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a311oi/sky130_fd_sc_ms__a311oi_1.spice b/cells/a311oi/sky130_fd_sc_ms__a311oi_1.spice
index de769bd..538ebc7 100644
--- a/cells/a311oi/sky130_fd_sc_ms__a311oi_1.spice
+++ b/cells/a311oi/sky130_fd_sc_ms__a311oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__a311oi_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_159_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=7.952e+11p ps=5.9e+06u
-M1001 a_231_74# A2 a_159_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=1.554e+11p ps=1.9e+06u
-M1002 Y C1 a_465_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=3.36e+11p ps=2.84e+06u
-M1003 a_465_368# B1 a_159_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y C1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.847e+11p pd=4.27e+06u as=4.847e+11p ps=4.27e+06u
-M1005 a_159_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A1 a_231_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_159_368# A3 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A2 a_159_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_231_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_465_368# C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_159_368# B1 a_465_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_159_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 Y B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VGND C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_159_74# A2 a_231_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR A1 a_159_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VPWR A3 a_159_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VGND A3 a_159_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a311oi/sky130_fd_sc_ms__a311oi_2.cdl b/cells/a311oi/sky130_fd_sc_ms__a311oi_2.cdl
index 902d3cb..495bfc2 100644
--- a/cells/a311oi/sky130_fd_sc_ms__a311oi_2.cdl
+++ b/cells/a311oi/sky130_fd_sc_ms__a311oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__a311oi_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 Y C1 VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a311oi_2
diff --git a/cells/a311oi/sky130_fd_sc_ms__a311oi_2.netlist.tsv b/cells/a311oi/sky130_fd_sc_ms__a311oi_2.netlist.tsv
index 8c900fc..1e70ae6 100644
--- a/cells/a311oi/sky130_fd_sc_ms__a311oi_2.netlist.tsv
+++ b/cells/a311oi/sky130_fd_sc_ms__a311oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__a311oi_2	A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a311oi/sky130_fd_sc_ms__a311oi_2.spice b/cells/a311oi/sky130_fd_sc_ms__a311oi_2.spice
index 8e765b9..033af8f 100644
--- a/cells/a311oi/sky130_fd_sc_ms__a311oi_2.spice
+++ b/cells/a311oi/sky130_fd_sc_ms__a311oi_2.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ms__a311oi_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 Y C1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=5.994e+11p pd=6.06e+06u as=7.178e+11p ps=4.9e+06u
-M1001 a_130_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2096e+12p pd=1.112e+07u as=1.2208e+12p ps=1.114e+07u
-M1002 a_130_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A2 a_130_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A1 a_130_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_130_368# B1 a_692_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=8.848e+11p ps=8.3e+06u
-M1006 a_692_368# B1 a_130_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y C1 a_692_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1008 a_45_74# A2 a_300_74# VNB nlowvt w=740000u l=150000u
-+  ad=5.994e+11p pd=6.06e+06u as=4.144e+11p ps=4.08e+06u
-M1009 a_45_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A3 a_45_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A1 a_300_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_692_368# C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_300_74# A2 a_45_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_300_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_130_368# A3 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A3 a_130_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_45_74# A2 a_300_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VPWR A3 a_130_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y A1 a_300_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR A2 a_130_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 Y B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_130_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_692_368# B1 a_130_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_692_368# C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 Y C1 a_692_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_45_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_130_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VPWR A1 a_130_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_130_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_130_368# B1 a_692_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VGND A3 a_45_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 VGND C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_300_74# A2 a_45_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_300_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a311oi/sky130_fd_sc_ms__a311oi_4.cdl b/cells/a311oi/sky130_fd_sc_ms__a311oi_4.cdl
index 9ddcb6a..d195c60 100644
--- a/cells/a311oi/sky130_fd_sc_ms__a311oi_4.cdl
+++ b/cells/a311oi/sky130_fd_sc_ms__a311oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__a311oi_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 pndB B1 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 Y C1 VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a311oi_4
diff --git a/cells/a311oi/sky130_fd_sc_ms__a311oi_4.netlist.tsv b/cells/a311oi/sky130_fd_sc_ms__a311oi_4.netlist.tsv
index c84e903..0f7eabf 100644
--- a/cells/a311oi/sky130_fd_sc_ms__a311oi_4.netlist.tsv
+++ b/cells/a311oi/sky130_fd_sc_ms__a311oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__a311oi_4	A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a311oi/sky130_fd_sc_ms__a311oi_4.spice b/cells/a311oi/sky130_fd_sc_ms__a311oi_4.spice
index 1dd58dc..b83f979 100644
--- a/cells/a311oi/sky130_fd_sc_ms__a311oi_4.spice
+++ b/cells/a311oi/sky130_fd_sc_ms__a311oi_4.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_ms__a311oi_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_117_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.4192e+12p pd=2.224e+07u as=2.0944e+12p ps=1.942e+07u
-M1001 a_117_368# B1 a_1213_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=1.512e+12p ps=1.39e+07u
-M1002 a_465_74# A2 a_34_74# VNB nlowvt w=740000u l=150000u
-+  ad=8.288e+11p pd=8.16e+06u as=1.0286e+12p ps=1.018e+07u
-M1003 a_34_74# A2 a_465_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A1 a_465_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.0286e+12p pd=1.018e+07u as=0p ps=0u
-M1005 VPWR A2 a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_1213_368# B1 a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_465_74# A2 a_34_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_117_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y C1 a_1213_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1010 VGND A3 a_34_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.4578e+12p pd=9.86e+06u as=0p ps=0u
-M1011 Y C1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A2 a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1213_368# C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y C1 a_1213_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_465_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_117_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_34_74# A2 a_465_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A1 a_465_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A1 a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1213_368# C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_117_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A3 a_34_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_465_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_34_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_34_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_117_368# A3 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A3 a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A1 a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_117_368# A3 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_117_368# B1 a_1213_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR A3 a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1213_368# B1 a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_117_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_1213_368# B1 a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_1213_368# B1 a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR A3 a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VGND C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_1213_368# C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VPWR A2 a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VPWR A2 a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_1213_368# C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 Y A1 a_465_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VGND B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 Y C1 a_1213_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VPWR A1 a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VGND A3 a_34_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_34_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_117_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VGND A3 a_34_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 Y A1 a_465_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 Y C1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_117_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 a_117_368# B1 a_1213_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_34_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_117_368# B1 a_1213_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_117_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 a_117_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 Y C1 a_1213_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 a_34_74# A2 a_465_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 a_465_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_117_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X30 a_465_74# A2 a_34_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 a_34_74# A2 a_465_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X32 a_465_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 VPWR A3 a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X34 VPWR A1 a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X35 a_465_74# A2 a_34_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a31o/sky130_fd_sc_ms__a31o_1.cdl b/cells/a31o/sky130_fd_sc_ms__a31o_1.cdl
index 1260243..100fbd2 100644
--- a/cells/a31o/sky130_fd_sc_ms__a31o_1.cdl
+++ b/cells/a31o/sky130_fd_sc_ms__a31o_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 y B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=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 nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=1 w=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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a31o_1
diff --git a/cells/a31o/sky130_fd_sc_ms__a31o_1.netlist.tsv b/cells/a31o/sky130_fd_sc_ms__a31o_1.netlist.tsv
index 38d2d04..65d0d6e 100644
--- a/cells/a31o/sky130_fd_sc_ms__a31o_1.netlist.tsv
+++ b/cells/a31o/sky130_fd_sc_ms__a31o_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31o/sky130_fd_sc_ms__a31o_1.spice b/cells/a31o/sky130_fd_sc_ms__a31o_1.spice
index 19028d0..4b12caf 100644
--- a/cells/a31o/sky130_fd_sc_ms__a31o_1.spice
+++ b/cells/a31o/sky130_fd_sc_ms__a31o_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__a31o_1 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 VGND B1 a_81_270# VNB nlowvt w=640000u l=150000u
-+  ad=5.827e+11p pd=4.47e+06u as=2.816e+11p ps=2.16e+06u
-M1001 a_253_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=9.8e+11p ps=6.14e+06u
-M1002 a_81_270# B1 a_253_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
-M1003 a_253_392# A3 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A2 a_253_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_337_120# A2 a_265_120# VNB nlowvt w=640000u l=150000u
-+  ad=2.5125e+11p pd=2.09e+06u as=1.344e+11p ps=1.7e+06u
-M1006 VGND a_81_270# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.961e+11p ps=2.01e+06u
-M1007 VPWR a_81_270# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.912e+11p ps=2.76e+06u
-M1008 a_265_120# A3 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_81_270# A1 a_337_120# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_253_392# B1 a_81_270# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VGND A3 a_265_120# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_265_120# A2 a_337_120# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_81_270# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 X a_81_270# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_253_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 VPWR A1 a_253_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_337_120# A1 a_81_270# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 X a_81_270# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VPWR A3 a_253_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/a31o/sky130_fd_sc_ms__a31o_2.cdl b/cells/a31o/sky130_fd_sc_ms__a31o_2.cdl
index ffee16a..70b4544 100644
--- a/cells/a31o/sky130_fd_sc_ms__a31o_2.cdl
+++ b/cells/a31o/sky130_fd_sc_ms__a31o_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 y B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a31o_2
diff --git a/cells/a31o/sky130_fd_sc_ms__a31o_2.netlist.tsv b/cells/a31o/sky130_fd_sc_ms__a31o_2.netlist.tsv
index 9163d87..edbd6b8 100644
--- a/cells/a31o/sky130_fd_sc_ms__a31o_2.netlist.tsv
+++ b/cells/a31o/sky130_fd_sc_ms__a31o_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31o/sky130_fd_sc_ms__a31o_2.spice b/cells/a31o/sky130_fd_sc_ms__a31o_2.spice
index 5d51f12..16b1d47 100644
--- a/cells/a31o/sky130_fd_sc_ms__a31o_2.spice
+++ b/cells/a31o/sky130_fd_sc_ms__a31o_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__a31o_2 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 VGND B1 a_97_296# VNB nlowvt w=740000u l=150000u
-+  ad=9.435e+11p pd=6.99e+06u as=3.108e+11p ps=2.32e+06u
-M1001 a_371_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1002 X a_97_296# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=1.3546e+12p ps=9.02e+06u
-M1003 VPWR a_97_296# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_365_368# A3 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.9e+11p pd=5.18e+06u as=0p ps=0u
-M1005 VPWR A2 a_365_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_449_74# A2 a_371_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=0p ps=0u
-M1007 VGND a_97_296# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1008 X a_97_296# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_365_368# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_97_296# B1 a_365_368# VPB pshort w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1011 a_97_296# A1 a_449_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_97_296# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_371_74# A2 a_449_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 X a_97_296# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VPWR A3 a_365_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VPWR A1 a_365_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_365_368# B1 a_97_296# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 VGND a_97_296# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR a_97_296# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VGND A3 a_371_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_365_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_449_74# A1 a_97_296# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 X a_97_296# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a31o/sky130_fd_sc_ms__a31o_4.cdl b/cells/a31o/sky130_fd_sc_ms__a31o_4.cdl
index 6362abe..dfefd5b 100644
--- a/cells/a31o/sky130_fd_sc_ms__a31o_4.cdl
+++ b/cells/a31o/sky130_fd_sc_ms__a31o_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 y B1 VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=2 w=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 nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=2 w=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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a31o_4
diff --git a/cells/a31o/sky130_fd_sc_ms__a31o_4.netlist.tsv b/cells/a31o/sky130_fd_sc_ms__a31o_4.netlist.tsv
index 2ed8ea3..5e147ac 100644
--- a/cells/a31o/sky130_fd_sc_ms__a31o_4.netlist.tsv
+++ b/cells/a31o/sky130_fd_sc_ms__a31o_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31o/sky130_fd_sc_ms__a31o_4.spice b/cells/a31o/sky130_fd_sc_ms__a31o_4.spice
index a82e5f1..cbaa387 100644
--- a/cells/a31o/sky130_fd_sc_ms__a31o_4.spice
+++ b/cells/a31o/sky130_fd_sc_ms__a31o_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__a31o_4 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 VPWR A1 a_529_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.1676e+12p pd=1.682e+07u as=1.57e+12p ps=1.314e+07u
-M1001 X a_83_274# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1002 a_83_274# B1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=5.888e+11p pd=5.68e+06u as=1.0507e+12p ps=1.001e+07u
-M1003 VGND A3 a_1000_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=5.44e+11p ps=5.54e+06u
-M1004 VPWR A2 a_529_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_83_274# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_775_74# A2 a_1000_74# VNB nlowvt w=640000u l=150000u
-+  ad=4.032e+11p pd=3.82e+06u as=0p ps=0u
-M1007 VGND B1 a_83_274# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_83_274# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_83_274# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_83_274# B1 a_529_392# VPB pshort w=1e+06u l=180000u
-+  ad=3.4e+11p pd=2.68e+06u as=0p ps=0u
-M1011 a_529_392# B1 a_83_274# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_83_274# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.662e+11p pd=4.22e+06u as=0p ps=0u
-M1013 VGND a_83_274# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_83_274# A1 a_775_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_775_74# A1 a_83_274# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1000_74# A3 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1000_74# A2 a_775_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_83_274# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_83_274# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_529_392# A3 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A3 a_529_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_529_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_529_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_83_274# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VPWR A1 a_529_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_83_274# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 VPWR a_83_274# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_83_274# A1 a_775_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_83_274# B1 a_529_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_529_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_529_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 X a_83_274# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VPWR A2 a_529_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 VGND a_83_274# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_529_392# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 VPWR a_83_274# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_1000_74# A2 a_775_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 X a_83_274# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 X a_83_274# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VPWR A3 a_529_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X17 a_529_392# B1 a_83_274# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 a_1000_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X19 X a_83_274# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_775_74# A2 a_1000_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X21 VGND B1 a_83_274# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X22 a_775_74# A1 a_83_274# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X23 VGND A3 a_1000_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/a31oi/sky130_fd_sc_ms__a31oi_1.cdl b/cells/a31oi/sky130_fd_sc_ms__a31oi_1.cdl
index 1b79713..fb2fa97 100644
--- a/cells/a31oi/sky130_fd_sc_ms__a31oi_1.cdl
+++ b/cells/a31oi/sky130_fd_sc_ms__a31oi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 Y B1 VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a31oi_1
diff --git a/cells/a31oi/sky130_fd_sc_ms__a31oi_1.netlist.tsv b/cells/a31oi/sky130_fd_sc_ms__a31oi_1.netlist.tsv
index b864f74..eaf9586 100644
--- a/cells/a31oi/sky130_fd_sc_ms__a31oi_1.netlist.tsv
+++ b/cells/a31oi/sky130_fd_sc_ms__a31oi_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31oi/sky130_fd_sc_ms__a31oi_1.spice b/cells/a31oi/sky130_fd_sc_ms__a31oi_1.spice
index 62939f8..814676a 100644
--- a/cells/a31oi/sky130_fd_sc_ms__a31oi_1.spice
+++ b/cells/a31oi/sky130_fd_sc_ms__a31oi_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__a31oi_1 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 VPWR A2 a_139_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=9.296e+11p pd=6.14e+06u as=6.608e+11p ps=5.66e+06u
-M1001 a_139_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y B1 a_139_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1003 Y A1 a_223_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=3.108e+11p ps=2.32e+06u
-M1004 a_223_74# A2 a_145_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1005 VGND B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=5.291e+11p pd=4.39e+06u as=0p ps=0u
-M1006 a_145_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_139_368# A3 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VGND A3 a_145_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VPWR A3 a_139_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_139_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_223_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VPWR A1 a_139_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_139_368# B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_145_74# A2 a_223_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a31oi/sky130_fd_sc_ms__a31oi_2.cdl b/cells/a31oi/sky130_fd_sc_ms__a31oi_2.cdl
index 225edb4..7293397 100644
--- a/cells/a31oi/sky130_fd_sc_ms__a31oi_2.cdl
+++ b/cells/a31oi/sky130_fd_sc_ms__a31oi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 Y B1 VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a31oi_2
diff --git a/cells/a31oi/sky130_fd_sc_ms__a31oi_2.netlist.tsv b/cells/a31oi/sky130_fd_sc_ms__a31oi_2.netlist.tsv
index 2cf95f7..09176a9 100644
--- a/cells/a31oi/sky130_fd_sc_ms__a31oi_2.netlist.tsv
+++ b/cells/a31oi/sky130_fd_sc_ms__a31oi_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31oi/sky130_fd_sc_ms__a31oi_2.spice b/cells/a31oi/sky130_fd_sc_ms__a31oi_2.spice
index d5e7e15..58f96d4 100644
--- a/cells/a31oi/sky130_fd_sc_ms__a31oi_2.spice
+++ b/cells/a31oi/sky130_fd_sc_ms__a31oi_2.spice
@@ -16,34 +16,19 @@
 
 
 .subckt sky130_fd_sc_ms__a31oi_2 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 a_200_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=4.773e+11p pd=4.25e+06u as=7.548e+11p ps=5e+06u
-M1001 Y B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=5.217e+11p ps=4.37e+06u
-M1002 a_27_368# A3 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.6464e+12p pd=1.414e+07u as=9.744e+11p ps=8.46e+06u
-M1003 VPWR A2 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A3 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A1 a_200_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A3 a_114_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.662e+11p ps=4.22e+06u
-M1007 a_114_74# A2 a_200_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1010 VPWR A1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_114_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_200_74# A2 a_114_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_368# B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_200_74# A2 a_114_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VPWR A1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y A1 a_200_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_114_74# A2 a_200_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_27_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VPWR A3 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_27_368# B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_114_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_200_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VGND A3 a_114_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a31oi/sky130_fd_sc_ms__a31oi_4.cdl b/cells/a31oi/sky130_fd_sc_ms__a31oi_4.cdl
index 4e4c1e5..272fdb0 100644
--- a/cells/a31oi/sky130_fd_sc_ms__a31oi_4.cdl
+++ b/cells/a31oi/sky130_fd_sc_ms__a31oi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 Y B1 VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a31oi_4
diff --git a/cells/a31oi/sky130_fd_sc_ms__a31oi_4.netlist.tsv b/cells/a31oi/sky130_fd_sc_ms__a31oi_4.netlist.tsv
index d03dace..7992d31 100644
--- a/cells/a31oi/sky130_fd_sc_ms__a31oi_4.netlist.tsv
+++ b/cells/a31oi/sky130_fd_sc_ms__a31oi_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31oi/sky130_fd_sc_ms__a31oi_4.spice b/cells/a31oi/sky130_fd_sc_ms__a31oi_4.spice
index 24820f3..55bc70b 100644
--- a/cells/a31oi/sky130_fd_sc_ms__a31oi_4.spice
+++ b/cells/a31oi/sky130_fd_sc_ms__a31oi_4.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_ms__a31oi_4 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 Y A1 a_475_74# VNB nlowvt w=740000u l=150000u
-+  ad=9.2695e+11p pd=8.48e+06u as=1.1544e+12p ps=9.04e+06u
-M1001 Y B1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.272e+11p pd=5.6e+06u as=3.4272e+12p ps=2.628e+07u
-M1002 a_27_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.0944e+12p ps=1.718e+07u
-M1003 a_475_74# A2 a_30_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.03482e+12p ps=1.022e+07u
-M1004 a_27_368# B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_475_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A3 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_368# A3 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_368# B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A3 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_30_74# A2 a_475_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_368# A3 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_30_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.2839e+12p ps=7.91e+06u
-M1016 VPWR A2 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A2 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A3 a_30_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_30_74# A2 a_475_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_475_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A1 a_475_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_475_74# A2 a_30_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND A3 a_30_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_30_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VPWR A3 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR A1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_27_368# B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VPWR A1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VPWR A3 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_475_74# A2 a_30_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 VGND B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 Y A1 a_475_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 Y B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_27_368# B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VGND A3 a_30_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_27_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_30_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_30_74# A2 a_475_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_475_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_475_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_30_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_30_74# A2 a_475_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_475_74# A2 a_30_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 a_27_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 VGND A3 a_30_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 Y A1 a_475_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/a32o/sky130_fd_sc_ms__a32o_1.cdl b/cells/a32o/sky130_fd_sc_ms__a32o_1.cdl
index c0ef6d7..f49a2ce 100644
--- a/cells/a32o/sky130_fd_sc_ms__a32o_1.cdl
+++ b/cells/a32o/sky130_fd_sc_ms__a32o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 y B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=1 w=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 nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=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 nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=1 w=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_lvt m=1 w=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 nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a32o_1
diff --git a/cells/a32o/sky130_fd_sc_ms__a32o_1.netlist.tsv b/cells/a32o/sky130_fd_sc_ms__a32o_1.netlist.tsv
index c63e39b..e85cc3a 100644
--- a/cells/a32o/sky130_fd_sc_ms__a32o_1.netlist.tsv
+++ b/cells/a32o/sky130_fd_sc_ms__a32o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	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	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8_lvt	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_lvt	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_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32o/sky130_fd_sc_ms__a32o_1.spice b/cells/a32o/sky130_fd_sc_ms__a32o_1.spice
index 2ca5c1e..05f3076 100644
--- a/cells/a32o/sky130_fd_sc_ms__a32o_1.spice
+++ b/cells/a32o/sky130_fd_sc_ms__a32o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__a32o_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_247_368# B2 a_84_48# VPB pshort w=1e+06u l=180000u
-+  ad=8.2e+11p pd=7.64e+06u as=3.7e+11p ps=2.74e+06u
-M1001 a_247_368# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.0496e+12p ps=6.26e+06u
-M1002 a_84_48# B1 a_247_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_247_368# A3 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A2 a_247_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_601_94# B1 a_84_48# VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=4.032e+11p ps=2.54e+06u
-M1006 a_259_94# A3 VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=6.004e+11p ps=4.48e+06u
-M1007 a_337_94# A2 a_259_94# VNB nlowvt w=640000u l=150000u
-+  ad=2.496e+11p pd=2.06e+06u as=0p ps=0u
-M1008 VPWR a_84_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1009 VGND B2 a_601_94# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_84_48# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1011 a_84_48# A1 a_337_94# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_84_48# B2 a_247_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_601_94# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 X a_84_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_247_368# B1 a_84_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_247_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_84_48# B1 a_601_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VPWR A1 a_247_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VPWR A3 a_247_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_259_94# A2 a_337_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 X a_84_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND A3 a_259_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 a_337_94# A1 a_84_48# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/a32o/sky130_fd_sc_ms__a32o_2.cdl b/cells/a32o/sky130_fd_sc_ms__a32o_2.cdl
index 40f22ed..b8bc205 100644
--- a/cells/a32o/sky130_fd_sc_ms__a32o_2.cdl
+++ b/cells/a32o/sky130_fd_sc_ms__a32o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 y B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a32o_2
diff --git a/cells/a32o/sky130_fd_sc_ms__a32o_2.netlist.tsv b/cells/a32o/sky130_fd_sc_ms__a32o_2.netlist.tsv
index ece24b8..67ab589 100644
--- a/cells/a32o/sky130_fd_sc_ms__a32o_2.netlist.tsv
+++ b/cells/a32o/sky130_fd_sc_ms__a32o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32o/sky130_fd_sc_ms__a32o_2.spice b/cells/a32o/sky130_fd_sc_ms__a32o_2.spice
index 3caea74..70d98dd 100644
--- a/cells/a32o/sky130_fd_sc_ms__a32o_2.spice
+++ b/cells/a32o/sky130_fd_sc_ms__a32o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__a32o_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_349_368# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=8.2e+11p pd=7.64e+06u as=1.417e+12p ps=9.14e+06u
-M1001 a_45_264# B1 a_349_368# VPB pshort w=1e+06u l=180000u
-+  ad=3.7e+11p pd=2.74e+06u as=0p ps=0u
-M1002 a_661_74# B1 a_45_264# VNB nlowvt w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=3.108e+11p ps=2.32e+06u
-M1003 VGND a_45_264# X VNB nlowvt w=740000u l=150000u
-+  ad=8.769e+11p pd=6.81e+06u as=2.146e+11p ps=2.06e+06u
-M1004 X a_45_264# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1005 VPWR a_45_264# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_433_74# A2 a_355_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=1.776e+11p ps=1.96e+06u
-M1007 a_355_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND B2 a_661_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_45_264# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_349_368# A3 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_45_264# A1 a_433_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A2 a_349_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_349_368# B2 a_45_264# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_45_264# B2 a_349_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_661_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_349_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 a_433_74# A1 a_45_264# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 X a_45_264# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_349_368# B1 a_45_264# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 VPWR a_45_264# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VPWR A3 a_349_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 VGND a_45_264# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR A1 a_349_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 X a_45_264# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_45_264# B1 a_661_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_355_74# A2 a_433_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VGND A3 a_355_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a32o/sky130_fd_sc_ms__a32o_4.cdl b/cells/a32o/sky130_fd_sc_ms__a32o_4.cdl
index a4d572c..3eb329c 100644
--- a/cells/a32o/sky130_fd_sc_ms__a32o_4.cdl
+++ b/cells/a32o/sky130_fd_sc_ms__a32o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 y B1 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=2 w=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 nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=2 w=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 nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=2 w=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_lvt m=2 w=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 nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a32o_4
diff --git a/cells/a32o/sky130_fd_sc_ms__a32o_4.netlist.tsv b/cells/a32o/sky130_fd_sc_ms__a32o_4.netlist.tsv
index a8bbf17..2da2477 100644
--- a/cells/a32o/sky130_fd_sc_ms__a32o_4.netlist.tsv
+++ b/cells/a32o/sky130_fd_sc_ms__a32o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__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	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	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	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	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32o/sky130_fd_sc_ms__a32o_4.spice b/cells/a32o/sky130_fd_sc_ms__a32o_4.spice
index 567f14a..4ba68af 100644
--- a/cells/a32o/sky130_fd_sc_ms__a32o_4.spice
+++ b/cells/a32o/sky130_fd_sc_ms__a32o_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__a32o_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_587_110# B2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=1.47252e+12p ps=1.141e+07u
-M1001 a_83_283# B1 a_587_110# VNB nlowvt w=640000u l=150000u
-+  ad=4.34975e+11p pd=4.13e+06u as=0p ps=0u
-M1002 a_992_122# A3 VGND VNB nlowvt w=640000u l=150000u
-+  ad=5.568e+11p pd=5.58e+06u as=0p ps=0u
-M1003 X a_83_283# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=2.0706e+12p ps=1.665e+07u
-M1004 X a_83_283# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_83_283# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_83_283# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_83_283# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.255e+11p pd=4.11e+06u as=0p ps=0u
-M1008 X a_83_283# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_992_122# A2 a_1079_122# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=4.096e+11p ps=3.84e+06u
-M1010 VPWR A2 a_509_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.955e+12p ps=1.591e+07u
-M1011 a_509_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A3 a_992_122# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_509_392# A3 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_83_283# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_509_392# B2 a_83_283# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=6.4e+11p ps=5.28e+06u
-M1016 a_509_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A3 a_509_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_509_392# B1 a_83_283# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_83_283# B1 a_509_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_83_283# B2 a_509_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_587_110# B1 a_83_283# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND B2 a_587_110# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_83_283# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1079_122# A2 a_992_122# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_83_283# A1 a_1079_122# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1079_122# A1 a_83_283# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A1 a_509_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A3 a_509_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VGND a_83_283# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_83_283# B1 a_587_110# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 VGND A3 a_992_122# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_509_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 VPWR A1 a_509_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 VGND a_83_283# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_587_110# B1 a_83_283# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_1079_122# A2 a_992_122# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 X a_83_283# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 VPWR A2 a_509_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 X a_83_283# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_992_122# A2 a_1079_122# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 a_509_392# B2 a_83_283# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 a_587_110# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 VPWR a_83_283# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_509_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X17 a_83_283# B1 a_509_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 a_1079_122# A1 a_83_283# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X19 VPWR a_83_283# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_992_122# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X21 a_509_392# B1 a_83_283# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X22 a_509_392# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X23 a_83_283# A1 a_1079_122# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X24 VGND B2 a_587_110# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X25 X a_83_283# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 a_83_283# B2 a_509_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X27 X a_83_283# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a32oi/sky130_fd_sc_ms__a32oi_1.cdl b/cells/a32oi/sky130_fd_sc_ms__a32oi_1.cdl
index c7c374d..8a98e51 100644
--- a/cells/a32oi/sky130_fd_sc_ms__a32oi_1.cdl
+++ b/cells/a32oi/sky130_fd_sc_ms__a32oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 Y B1 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 Y B2 VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a32oi_1
diff --git a/cells/a32oi/sky130_fd_sc_ms__a32oi_1.netlist.tsv b/cells/a32oi/sky130_fd_sc_ms__a32oi_1.netlist.tsv
index 036f4db..8548cd7 100644
--- a/cells/a32oi/sky130_fd_sc_ms__a32oi_1.netlist.tsv
+++ b/cells/a32oi/sky130_fd_sc_ms__a32oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32oi/sky130_fd_sc_ms__a32oi_1.spice b/cells/a32oi/sky130_fd_sc_ms__a32oi_1.spice
index 3f691dd..04084db 100644
--- a/cells/a32oi/sky130_fd_sc_ms__a32oi_1.spice
+++ b/cells/a32oi/sky130_fd_sc_ms__a32oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__a32oi_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 Y B1 a_119_74# VNB nlowvt w=740000u l=150000u
-+  ad=6.068e+11p pd=3.12e+06u as=1.776e+11p ps=1.96e+06u
-M1001 VGND A3 a_469_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.403e+11p pd=4.15e+06u as=3.108e+11p ps=2.32e+06u
-M1002 a_27_368# B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=1.0976e+12p pd=8.68e+06u as=3.584e+11p ps=2.88e+06u
-M1003 Y B2 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=9.968e+11p ps=6.26e+06u
-M1005 a_119_74# B2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A3 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_391_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1009 a_469_74# A2 a_391_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_391_74# A2 a_469_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_119_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND B2 a_119_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_27_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 Y A1 a_391_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_469_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/a32oi/sky130_fd_sc_ms__a32oi_2.cdl b/cells/a32oi/sky130_fd_sc_ms__a32oi_2.cdl
index c18692a..15f9e3a 100644
--- a/cells/a32oi/sky130_fd_sc_ms__a32oi_2.cdl
+++ b/cells/a32oi/sky130_fd_sc_ms__a32oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 Y B1 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 Y B2 VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a32oi_2
diff --git a/cells/a32oi/sky130_fd_sc_ms__a32oi_2.netlist.tsv b/cells/a32oi/sky130_fd_sc_ms__a32oi_2.netlist.tsv
index 3470e84..979a304 100644
--- a/cells/a32oi/sky130_fd_sc_ms__a32oi_2.netlist.tsv
+++ b/cells/a32oi/sky130_fd_sc_ms__a32oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32oi/sky130_fd_sc_ms__a32oi_2.spice b/cells/a32oi/sky130_fd_sc_ms__a32oi_2.spice
index aa77cde..1693cbc 100644
--- a/cells/a32oi/sky130_fd_sc_ms__a32oi_2.spice
+++ b/cells/a32oi/sky130_fd_sc_ms__a32oi_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__a32oi_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 Y B2 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=7.112e+11p pd=5.75e+06u as=2.1504e+12p ps=1.728e+07u
-M1001 a_27_368# B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR A1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.5288e+12p pd=9.45e+06u as=0p ps=0u
-M1003 Y B1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_771_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.995e+11p pd=4.31e+06u as=6.66e+11p ps=6.24e+06u
-M1006 a_27_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=6.808e+11p ps=6.28e+06u
-M1008 Y A1 a_507_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=6.475e+11p ps=6.19e+06u
-M1009 VGND A3 a_771_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_74# B2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_507_74# A2 a_771_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A3 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_771_74# A2 a_507_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_368# A3 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND B2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_507_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A2 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A1 a_507_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_27_368# B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VPWR A1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VGND B2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_27_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VGND A3 a_771_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 VPWR A3 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_771_74# A2 a_507_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_507_74# A2 a_771_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_771_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_507_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_27_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 Y B2 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_27_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a32oi/sky130_fd_sc_ms__a32oi_4.cdl b/cells/a32oi/sky130_fd_sc_ms__a32oi_4.cdl
index 23d6e3c..f0ec52a 100644
--- a/cells/a32oi/sky130_fd_sc_ms__a32oi_4.cdl
+++ b/cells/a32oi/sky130_fd_sc_ms__a32oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 Y B1 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 Y B2 VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a32oi_4
diff --git a/cells/a32oi/sky130_fd_sc_ms__a32oi_4.netlist.tsv b/cells/a32oi/sky130_fd_sc_ms__a32oi_4.netlist.tsv
index 89c1a38..8d95f40 100644
--- a/cells/a32oi/sky130_fd_sc_ms__a32oi_4.netlist.tsv
+++ b/cells/a32oi/sky130_fd_sc_ms__a32oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32oi/sky130_fd_sc_ms__a32oi_4.spice b/cells/a32oi/sky130_fd_sc_ms__a32oi_4.spice
index 8d15295..558ec0d 100644
--- a/cells/a32oi/sky130_fd_sc_ms__a32oi_4.spice
+++ b/cells/a32oi/sky130_fd_sc_ms__a32oi_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ms__a32oi_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 Y B2 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.372e+12p pd=1.141e+07u as=3.8024e+12p ps=3.143e+07u
-M1001 a_868_74# A2 a_1313_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.0471e+12p pd=1.023e+07u as=8.288e+11p ps=8.16e+06u
-M1002 VPWR A2 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=2.3128e+12p pd=1.757e+07u as=0p ps=0u
-M1003 a_27_368# A3 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A3 a_1313_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.1433e+12p pd=1.049e+07u as=0p ps=0u
-M1005 a_868_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=8.806e+11p ps=8.3e+06u
-M1006 a_1313_74# A2 a_868_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_74# B2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.0952e+12p pd=1.036e+07u as=0p ps=0u
-M1009 a_27_368# B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B2 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_368# B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_74# B2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A3 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_368# A3 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1313_74# A2 a_868_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_868_74# A2 a_1313_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A3 a_1313_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_27_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A3 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_868_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A2 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR A1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND B2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Y A1 a_868_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND B2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y A1 a_868_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1313_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_27_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_1313_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_27_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_1313_74# A2 a_868_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR A3 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_27_368# B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VPWR A3 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_27_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_27_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_27_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_868_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 Y A1 a_868_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_27_368# B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VGND B2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 VPWR A1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 VPWR A1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_1313_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 Y A1 a_868_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 a_1313_74# A2 a_868_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_1313_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 a_27_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 VGND B2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_868_74# A2 a_1313_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X30 a_868_74# A2 a_1313_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X32 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 VGND A3 a_1313_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 Y B2 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X35 Y B2 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X36 a_27_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X37 a_868_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X38 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X39 VGND A3 a_1313_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a41o/sky130_fd_sc_ms__a41o_1.cdl b/cells/a41o/sky130_fd_sc_ms__a41o_1.cdl
index c1fdc0b..a79550d 100644
--- a/cells/a41o/sky130_fd_sc_ms__a41o_1.cdl
+++ b/cells/a41o/sky130_fd_sc_ms__a41o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__a41o_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 pndA A4 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA3 pndA A4 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 y B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA3 sndA3 A4 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA3 sndA3 A4 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a41o_1
diff --git a/cells/a41o/sky130_fd_sc_ms__a41o_1.netlist.tsv b/cells/a41o/sky130_fd_sc_ms__a41o_1.netlist.tsv
index 1799c5d..993a62b 100644
--- a/cells/a41o/sky130_fd_sc_ms__a41o_1.netlist.tsv
+++ b/cells/a41o/sky130_fd_sc_ms__a41o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__a41o_1	A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	pndA	A4	VPWR	VPB	pfet_01v8	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	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	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a41o/sky130_fd_sc_ms__a41o_1.spice b/cells/a41o/sky130_fd_sc_ms__a41o_1.spice
index dc6ebf5..e5fe70c 100644
--- a/cells/a41o/sky130_fd_sc_ms__a41o_1.spice
+++ b/cells/a41o/sky130_fd_sc_ms__a41o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__a41o_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 a_543_74# A2 a_449_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=2.368e+11p ps=2.12e+06u
-M1001 VPWR a_83_244# X VPB pshort w=1.12e+06u l=180000u
-+  ad=1.1036e+12p pd=8.38e+06u as=3.136e+11p ps=2.8e+06u
-M1002 a_357_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=8.7e+11p pd=7.74e+06u as=0p ps=0u
-M1003 a_449_74# A1 a_83_244# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1004 VPWR A3 a_357_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_83_244# X VNB nlowvt w=740000u l=150000u
-+  ad=5.217e+11p pd=4.37e+06u as=7.104e+11p ps=3.4e+06u
-M1006 a_657_74# A3 a_543_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=0p ps=0u
-M1007 a_357_392# A4 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_83_244# B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A4 a_657_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_357_392# B1 a_83_244# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1011 VPWR A1 a_357_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_83_244# A1 a_449_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_357_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VPWR A4 a_357_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 VGND B1 a_83_244# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_357_392# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 X a_83_244# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 X a_83_244# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_657_74# A4 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_449_74# A2 a_543_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR A2 a_357_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_543_74# A3 a_657_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_83_244# B1 a_357_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/a41o/sky130_fd_sc_ms__a41o_2.cdl b/cells/a41o/sky130_fd_sc_ms__a41o_2.cdl
index a0e7216..37c7a83 100644
--- a/cells/a41o/sky130_fd_sc_ms__a41o_2.cdl
+++ b/cells/a41o/sky130_fd_sc_ms__a41o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__a41o_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 pndA A4 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA3 pndA A4 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 y B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA3 sndA3 A4 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA3 sndA3 A4 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a41o_2
diff --git a/cells/a41o/sky130_fd_sc_ms__a41o_2.netlist.tsv b/cells/a41o/sky130_fd_sc_ms__a41o_2.netlist.tsv
index b87c842..ea4efb6 100644
--- a/cells/a41o/sky130_fd_sc_ms__a41o_2.netlist.tsv
+++ b/cells/a41o/sky130_fd_sc_ms__a41o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__a41o_2	A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	pndA	A4	VPWR	VPB	pfet_01v8	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	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a41o/sky130_fd_sc_ms__a41o_2.spice b/cells/a41o/sky130_fd_sc_ms__a41o_2.spice
index 0b58bb5..d40b1f8 100644
--- a/cells/a41o/sky130_fd_sc_ms__a41o_2.spice
+++ b/cells/a41o/sky130_fd_sc_ms__a41o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__a41o_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 VPWR a_441_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=1.6592e+12p pd=1.164e+07u as=3.024e+11p ps=2.78e+06u
-M1001 a_441_74# B1 a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=3.3e+11p pd=2.66e+06u as=8.2e+11p ps=7.64e+06u
-M1002 VPWR A4 a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND B1 a_441_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.1063e+12p pd=7.43e+06u as=2.886e+11p ps=2.26e+06u
-M1004 a_199_74# A3 a_121_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=1.776e+11p ps=1.96e+06u
-M1005 a_121_74# A4 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_313_74# A2 a_199_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.626e+11p pd=2.46e+06u as=0p ps=0u
-M1007 a_441_74# A1 a_313_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_392# A3 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_441_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=3.034e+11p pd=2.3e+06u as=0p ps=0u
-M1010 VPWR A2 a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_441_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_441_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_121_74# A3 a_199_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_313_74# A1 a_441_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_27_392# B1 a_441_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 VGND a_441_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 X a_441_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VGND A4 a_121_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_27_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VPWR A1 a_27_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_199_74# A2 a_313_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR a_441_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 X a_441_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VPWR A3 a_27_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 a_441_74# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_27_392# A4 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/a41o/sky130_fd_sc_ms__a41o_4.cdl b/cells/a41o/sky130_fd_sc_ms__a41o_4.cdl
index 38a8f58..3faa4db 100644
--- a/cells/a41o/sky130_fd_sc_ms__a41o_4.cdl
+++ b/cells/a41o/sky130_fd_sc_ms__a41o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__a41o_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 pndA A4 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA3 pndA A4 VPB pfet_01v8 m=2 w=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 pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 y B1 VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA3 sndA3 A4 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA3 sndA3 A4 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a41o_4
diff --git a/cells/a41o/sky130_fd_sc_ms__a41o_4.netlist.tsv b/cells/a41o/sky130_fd_sc_ms__a41o_4.netlist.tsv
index 0f96bbe..44b4dcd 100644
--- a/cells/a41o/sky130_fd_sc_ms__a41o_4.netlist.tsv
+++ b/cells/a41o/sky130_fd_sc_ms__a41o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__a41o_4	A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	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	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	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	pndA	A4	VPWR	VPB	pfet_01v8	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	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a41o/sky130_fd_sc_ms__a41o_4.spice b/cells/a41o/sky130_fd_sc_ms__a41o_4.spice
index dcf9c17..e1ba82e 100644
--- a/cells/a41o/sky130_fd_sc_ms__a41o_4.spice
+++ b/cells/a41o/sky130_fd_sc_ms__a41o_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__a41o_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 a_113_98# B1 a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=3.2e+11p pd=2.64e+06u as=1.885e+12p ps=1.577e+07u
-M1001 VGND a_113_98# X VNB nlowvt w=740000u l=150000u
-+  ad=1.5409e+12p pd=1.26e+07u as=4.144e+11p ps=4.08e+06u
-M1002 a_1205_74# A4 VGND VNB nlowvt w=740000u l=150000u
-+  ad=6.216e+11p pd=6.12e+06u as=0p ps=0u
-M1003 a_1205_74# A3 a_1010_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1004 X a_113_98# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_751_74# A2 a_1010_74# VNB nlowvt w=740000u l=150000u
-+  ad=6.216e+11p pd=6.12e+06u as=0p ps=0u
-M1006 a_113_98# B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1007 a_27_392# A4 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.451e+12p ps=1.943e+07u
-M1008 a_27_392# A3 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A3 a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A4 a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_392# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_113_98# A1 a_751_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_751_74# A1 a_113_98# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A2 a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A4 a_1205_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A1 a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_113_98# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND B1 a_113_98# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1010_74# A3 a_1205_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_113_98# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1022 VPWR a_113_98# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_113_98# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_113_98# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_113_98# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1010_74# A2 a_751_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_27_392# B1 a_113_98# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_113_98# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_27_392# A4 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VGND a_113_98# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR A3 a_27_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_1205_74# A4 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_27_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_113_98# B1 a_27_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_113_98# A1 a_751_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_27_392# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 X a_113_98# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_751_74# A1 a_113_98# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VPWR A1 a_27_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 VPWR A4 a_27_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 VGND a_113_98# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 X a_113_98# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_751_74# A2 a_1010_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 X a_113_98# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VPWR A2 a_27_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 a_113_98# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 X a_113_98# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 VGND B1 a_113_98# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 a_27_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X22 a_1010_74# A2 a_751_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_1010_74# A3 a_1205_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_27_392# B1 a_113_98# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X25 VPWR a_113_98# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 a_1205_74# A3 a_1010_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 VGND A4 a_1205_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a41oi/sky130_fd_sc_ms__a41oi_1.cdl b/cells/a41oi/sky130_fd_sc_ms__a41oi_1.cdl
index 01e52ba..6bcc137 100644
--- a/cells/a41oi/sky130_fd_sc_ms__a41oi_1.cdl
+++ b/cells/a41oi/sky130_fd_sc_ms__a41oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__a41oi_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 pndA A4 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA3 pndA A4 VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 Y B1 VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA3 sndA3 A4 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA3 sndA3 A4 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a41oi_1
diff --git a/cells/a41oi/sky130_fd_sc_ms__a41oi_1.netlist.tsv b/cells/a41oi/sky130_fd_sc_ms__a41oi_1.netlist.tsv
index d6c26dc..0cfee35 100644
--- a/cells/a41oi/sky130_fd_sc_ms__a41oi_1.netlist.tsv
+++ b/cells/a41oi/sky130_fd_sc_ms__a41oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__a41oi_1	A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	pndA	A4	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a41oi/sky130_fd_sc_ms__a41oi_1.spice b/cells/a41oi/sky130_fd_sc_ms__a41oi_1.spice
index 3a179a8..93ca409 100644
--- a/cells/a41oi/sky130_fd_sc_ms__a41oi_1.spice
+++ b/cells/a41oi/sky130_fd_sc_ms__a41oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__a41oi_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 VPWR A2 a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.1648e+12p pd=6.56e+06u as=9.744e+11p ps=8.46e+06u
-M1001 Y A1 a_469_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.218e+11p pd=4.1e+06u as=3.108e+11p ps=2.32e+06u
-M1002 VPWR A4 a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_119_368# B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1004 a_119_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_277_74# A4 VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=4.921e+11p ps=2.81e+06u
-M1006 a_355_74# A3 a_277_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=0p ps=0u
-M1007 VGND B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_469_74# A2 a_355_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_119_368# A3 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_119_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_355_74# A2 a_469_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 Y B1 a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VPWR A3 a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR A1 a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_469_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_119_368# A4 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_277_74# A3 a_355_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 Y B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VGND A4 a_277_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/a41oi/sky130_fd_sc_ms__a41oi_2.cdl b/cells/a41oi/sky130_fd_sc_ms__a41oi_2.cdl
index eefd68c..5a948ce 100644
--- a/cells/a41oi/sky130_fd_sc_ms__a41oi_2.cdl
+++ b/cells/a41oi/sky130_fd_sc_ms__a41oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__a41oi_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 pndA A4 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA3 pndA A4 VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 Y B1 VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA3 sndA3 A4 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA3 sndA3 A4 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a41oi_2
diff --git a/cells/a41oi/sky130_fd_sc_ms__a41oi_2.netlist.tsv b/cells/a41oi/sky130_fd_sc_ms__a41oi_2.netlist.tsv
index 0365c56..e68f1be 100644
--- a/cells/a41oi/sky130_fd_sc_ms__a41oi_2.netlist.tsv
+++ b/cells/a41oi/sky130_fd_sc_ms__a41oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__a41oi_2	A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	pndA	A4	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a41oi/sky130_fd_sc_ms__a41oi_2.spice b/cells/a41oi/sky130_fd_sc_ms__a41oi_2.spice
index 233d036..51f636b 100644
--- a/cells/a41oi/sky130_fd_sc_ms__a41oi_2.spice
+++ b/cells/a41oi/sky130_fd_sc_ms__a41oi_2.spice
@@ -16,42 +16,23 @@
 
 
 .subckt sky130_fd_sc_ms__a41oi_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 a_27_368# A3 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.016e+12p pd=1.704e+07u as=1.7584e+12p ps=1.21e+07u
-M1001 a_27_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A3 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_709_74# A3 a_512_74# VNB nlowvt w=740000u l=150000u
-+  ad=6.438e+11p pd=6.18e+06u as=4.144e+11p ps=4.08e+06u
-M1005 VPWR A2 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_368# B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.584e+11p ps=2.88e+06u
-M1008 VPWR A4 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_239_74# A2 a_512_74# VNB nlowvt w=740000u l=150000u
-+  ad=6.808e+11p pd=6.28e+06u as=0p ps=0u
-M1011 Y A1 a_239_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.181e+11p pd=4.09e+06u as=0p ps=0u
-M1012 a_27_368# A4 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=5.069e+11p ps=4.33e+06u
-M1014 a_709_74# A4 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A4 a_709_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_512_74# A2 a_239_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_512_74# A3 a_709_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_239_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_709_74# A3 a_512_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VGND B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_709_74# A4 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_27_368# A4 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_512_74# A2 a_239_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_512_74# A3 a_709_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VPWR A3 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VPWR A4 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_239_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_239_74# A2 a_512_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VPWR A1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_27_368# B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 Y A1 a_239_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VGND A4 a_709_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/a41oi/sky130_fd_sc_ms__a41oi_4.cdl b/cells/a41oi/sky130_fd_sc_ms__a41oi_4.cdl
index 5cd714a..2b36a3d 100644
--- a/cells/a41oi/sky130_fd_sc_ms__a41oi_4.cdl
+++ b/cells/a41oi/sky130_fd_sc_ms__a41oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__a41oi_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 pndA A3 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 pndA A4 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA3 pndA A4 VPB pfet_01v8 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 Y B1 VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA3 sndA3 A4 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA3 sndA3 A4 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__a41oi_4
diff --git a/cells/a41oi/sky130_fd_sc_ms__a41oi_4.netlist.tsv b/cells/a41oi/sky130_fd_sc_ms__a41oi_4.netlist.tsv
index 558cfcc..2d31123 100644
--- a/cells/a41oi/sky130_fd_sc_ms__a41oi_4.netlist.tsv
+++ b/cells/a41oi/sky130_fd_sc_ms__a41oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__a41oi_4	A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	pndA	A4	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a41oi/sky130_fd_sc_ms__a41oi_4.spice b/cells/a41oi/sky130_fd_sc_ms__a41oi_4.spice
index e865f4d..e8bf10c 100644
--- a/cells/a41oi/sky130_fd_sc_ms__a41oi_4.spice
+++ b/cells/a41oi/sky130_fd_sc_ms__a41oi_4.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_ms__a41oi_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 a_27_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.4664e+12p pd=3.083e+07u as=2.828e+12p ps=2.297e+07u
-M1001 VPWR A4 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y B1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.552e+11p pd=5.65e+06u as=0p ps=0u
-M1003 VPWR A2 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_1235_74# A4 VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.0434e+12p pd=1.022e+07u as=8.658e+11p ps=8.26e+06u
-M1005 a_852_74# A2 a_325_74# VNB nlowvt w=740000u l=150000u
-+  ad=8.806e+11p pd=8.3e+06u as=1.3468e+12p ps=1.104e+07u
-M1006 a_325_74# A2 a_852_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1235_74# A3 a_852_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_368# B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_368# A4 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_368# B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=7.252e+11p ps=6.4e+06u
-M1016 VGND A4 a_1235_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A4 a_1235_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_852_74# A3 a_1235_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A1 a_325_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_852_74# A3 a_1235_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_325_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_325_74# A2 a_852_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_368# A2 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR A2 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A1 a_325_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_852_74# A2 a_325_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1235_74# A4 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A3 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_368# A3 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR A4 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1235_74# A3 a_852_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_27_368# A3 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR A3 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_325_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_27_368# A4 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR A3 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_27_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_27_368# A4 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_27_368# B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_1235_74# A3 a_852_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_27_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VPWR A4 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_325_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_325_74# A2 a_852_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_852_74# A2 a_325_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_325_74# A2 a_852_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_1235_74# A4 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 Y A1 a_325_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_852_74# A3 a_1235_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_27_368# B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 Y A1 a_325_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_1235_74# A4 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 VGND A4 a_1235_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 VPWR A4 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_325_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 VPWR A1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 VPWR A3 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 Y B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X30 a_852_74# A3 a_1235_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 a_852_74# A2 a_325_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 VGND A4 a_1235_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 VGND B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X35 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X36 a_27_368# A4 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X37 a_1235_74# A3 a_852_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_ms__and2_1.cdl b/cells/and2/sky130_fd_sc_ms__and2_1.cdl
index 8db400d..7ca6235 100644
--- a/cells/and2/sky130_fd_sc_ms__and2_1.cdl
+++ b/cells/and2/sky130_fd_sc_ms__and2_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8 m=1 w=1.12 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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and2_1
diff --git a/cells/and2/sky130_fd_sc_ms__and2_1.netlist.tsv b/cells/and2/sky130_fd_sc_ms__and2_1.netlist.tsv
index 02f9897..d297d65 100644
--- a/cells/and2/sky130_fd_sc_ms__and2_1.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_ms__and2_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__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	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2/sky130_fd_sc_ms__and2_1.spice b/cells/and2/sky130_fd_sc_ms__and2_1.spice
index 8d41310..8cdea58 100644
--- a/cells/and2/sky130_fd_sc_ms__and2_1.spice
+++ b/cells/and2/sky130_fd_sc_ms__and2_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ms__and2_1 A B VGND VNB VPB VPWR X
-M1000 a_56_136# A VPWR VPB pshort w=840000u l=180000u
-+  ad=2.688e+11p pd=2.32e+06u as=6.076e+11p ps=5.2e+06u
-M1001 VPWR B a_56_136# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 X a_56_136# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1003 VGND B a_143_136# VNB nlowvt w=640000u l=150000u
-+  ad=3.107e+11p pd=2.34e+06u as=2.752e+11p ps=2.28e+06u
-M1004 a_143_136# A a_56_136# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1005 X a_56_136# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
+X0 VPWR a_56_136# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_143_136# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 VPWR A a_56_136# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 VGND a_56_136# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_56_136# A a_143_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_56_136# B VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_ms__and2_2.cdl b/cells/and2/sky130_fd_sc_ms__and2_2.cdl
index 8750832..b1ca79e 100644
--- a/cells/and2/sky130_fd_sc_ms__and2_2.cdl
+++ b/cells/and2/sky130_fd_sc_ms__and2_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=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 pshort m=1 w=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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8 m=2 w=1.12 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_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and2_2
diff --git a/cells/and2/sky130_fd_sc_ms__and2_2.netlist.tsv b/cells/and2/sky130_fd_sc_ms__and2_2.netlist.tsv
index b974a88..9ee5ee1 100644
--- a/cells/and2/sky130_fd_sc_ms__and2_2.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_ms__and2_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	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	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2/sky130_fd_sc_ms__and2_2.spice b/cells/and2/sky130_fd_sc_ms__and2_2.spice
index 29a4c30..f54fe28 100644
--- a/cells/and2/sky130_fd_sc_ms__and2_2.spice
+++ b/cells/and2/sky130_fd_sc_ms__and2_2.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__and2_2 A B VGND VNB VPB VPWR X
-M1000 VPWR B a_31_74# VPB pshort w=1e+06u l=180000u
-+  ad=9.324e+11p pd=8.22e+06u as=2.7e+11p ps=2.54e+06u
-M1001 X a_31_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1002 a_31_74# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND B a_118_74# VNB nlowvt w=740000u l=150000u
-+  ad=5.217e+11p pd=4.37e+06u as=1.776e+11p ps=1.96e+06u
-M1004 VPWR a_31_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_31_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1006 a_118_74# A a_31_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1007 VGND a_31_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_31_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 X a_31_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VPWR a_31_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_118_74# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_31_74# A a_118_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_31_74# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 X a_31_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND a_31_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_ms__and2_4.cdl b/cells/and2/sky130_fd_sc_ms__and2_4.cdl
index 10c14c5..ff6b71e 100644
--- a/cells/and2/sky130_fd_sc_ms__and2_4.cdl
+++ b/cells/and2/sky130_fd_sc_ms__and2_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8 m=4 w=1.12 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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and2_4
diff --git a/cells/and2/sky130_fd_sc_ms__and2_4.netlist.tsv b/cells/and2/sky130_fd_sc_ms__and2_4.netlist.tsv
index a7c5c24..d718ef4 100644
--- a/cells/and2/sky130_fd_sc_ms__and2_4.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_ms__and2_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__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	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2/sky130_fd_sc_ms__and2_4.spice b/cells/and2/sky130_fd_sc_ms__and2_4.spice
index 0711eef..01a413a 100644
--- a/cells/and2/sky130_fd_sc_ms__and2_4.spice
+++ b/cells/and2/sky130_fd_sc_ms__and2_4.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ms__and2_4 A B VGND VNB VPB VPWR X
-M1000 VGND a_83_269# X VNB nlowvt w=740000u l=150000u
-+  ad=8.594e+11p pd=8.14e+06u as=5.254e+11p ps=4.38e+06u
-M1001 X a_83_269# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_83_269# A a_504_119# VNB nlowvt w=640000u l=150000u
-+  ad=2.08e+11p pd=1.93e+06u as=3.872e+11p ps=3.77e+06u
-M1003 VGND a_83_269# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_504_119# B VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_504_119# A a_83_269# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_83_269# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.272e+11p pd=5.6e+06u as=1.46945e+12p ps=1.304e+07u
-M1007 VPWR a_83_269# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND B a_504_119# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_83_269# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_83_269# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A a_83_269# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=4.746e+11p ps=4.49e+06u
-M1012 X a_83_269# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_83_269# B VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_83_269# A VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR B a_83_269# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_83_269# B VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 X a_83_269# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_504_119# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 VGND B a_504_119# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_83_269# A VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 VGND a_83_269# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR A a_83_269# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 X a_83_269# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VGND a_83_269# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR a_83_269# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 X a_83_269# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VPWR B a_83_269# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X12 VPWR a_83_269# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_504_119# A a_83_269# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 a_83_269# A a_504_119# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 X a_83_269# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/and2b/sky130_fd_sc_ms__and2b_1.cdl b/cells/and2b/sky130_fd_sc_ms__and2b_1.cdl
index b91065b..6fb7052 100644
--- a/cells/and2b/sky130_fd_sc_ms__and2b_1.cdl
+++ b/cells/and2b/sky130_fd_sc_ms__and2b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X y VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and2b_1
diff --git a/cells/and2b/sky130_fd_sc_ms__and2b_1.netlist.tsv b/cells/and2b/sky130_fd_sc_ms__and2b_1.netlist.tsv
index 59026bd..bb30005 100644
--- a/cells/and2b/sky130_fd_sc_ms__and2b_1.netlist.tsv
+++ b/cells/and2b/sky130_fd_sc_ms__and2b_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2b/sky130_fd_sc_ms__and2b_1.spice b/cells/and2b/sky130_fd_sc_ms__and2b_1.spice
index b89f7d4..49ebc13 100644
--- a/cells/and2b/sky130_fd_sc_ms__and2b_1.spice
+++ b/cells/and2b/sky130_fd_sc_ms__and2b_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__and2b_1 A_N B VGND VNB VPB VPWR X
-M1000 VGND B a_353_98# VNB nlowvt w=640000u l=150000u
-+  ad=6.2665e+11p pd=4.56e+06u as=1.536e+11p ps=1.76e+06u
-M1001 a_353_98# a_27_74# a_266_98# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1002 X a_266_98# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=6.594e+11p ps=5.27e+06u
-M1003 X a_266_98# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1004 VPWR A_N a_27_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=8.4e+11p ps=3.68e+06u
-M1005 a_266_98# a_27_74# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1006 VGND A_N a_27_74# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1007 VPWR B a_266_98# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 a_266_98# B VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 VGND a_266_98# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR a_266_98# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_353_98# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_266_98# a_27_74# a_353_98# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VPWR a_27_74# a_266_98# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 a_27_74# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
 .ends
diff --git a/cells/and2b/sky130_fd_sc_ms__and2b_2.cdl b/cells/and2b/sky130_fd_sc_ms__and2b_2.cdl
index 310d21f..36c51af 100644
--- a/cells/and2b/sky130_fd_sc_ms__and2b_2.cdl
+++ b/cells/and2b/sky130_fd_sc_ms__and2b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=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 pshort m=1 w=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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X y VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and2b_2
diff --git a/cells/and2b/sky130_fd_sc_ms__and2b_2.netlist.tsv b/cells/and2b/sky130_fd_sc_ms__and2b_2.netlist.tsv
index 59dd102..9c81017 100644
--- a/cells/and2b/sky130_fd_sc_ms__and2b_2.netlist.tsv
+++ b/cells/and2b/sky130_fd_sc_ms__and2b_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	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	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	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2b/sky130_fd_sc_ms__and2b_2.spice b/cells/and2b/sky130_fd_sc_ms__and2b_2.spice
index 2814d2d..3bb3c35 100644
--- a/cells/and2b/sky130_fd_sc_ms__and2b_2.spice
+++ b/cells/and2b/sky130_fd_sc_ms__and2b_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__and2b_2 A_N B VGND VNB VPB VPWR X
-M1000 a_505_74# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=8.742e+11p ps=5.41e+06u
-M1001 a_198_48# a_27_74# a_505_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1002 VPWR a_198_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=1.45745e+12p pd=9.24e+06u as=3.024e+11p ps=2.78e+06u
-M1003 VPWR A_N a_27_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1004 VGND a_198_48# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1005 a_198_48# B VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1006 VPWR a_27_74# a_198_48# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A_N a_27_74# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1008 X a_198_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_198_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_198_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VGND a_198_48# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_198_48# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 X a_198_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_27_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 a_505_74# a_27_74# a_198_48# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR B a_198_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VGND B a_505_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VPWR a_198_48# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_27_74# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
 .ends
diff --git a/cells/and2b/sky130_fd_sc_ms__and2b_4.cdl b/cells/and2b/sky130_fd_sc_ms__and2b_4.cdl
index 528ad65..a0b563b 100644
--- a/cells/and2b/sky130_fd_sc_ms__and2b_4.cdl
+++ b/cells/and2b/sky130_fd_sc_ms__and2b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X y VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and2b_4
diff --git a/cells/and2b/sky130_fd_sc_ms__and2b_4.netlist.tsv b/cells/and2b/sky130_fd_sc_ms__and2b_4.netlist.tsv
index 8776f7d..b88ca08 100644
--- a/cells/and2b/sky130_fd_sc_ms__and2b_4.netlist.tsv
+++ b/cells/and2b/sky130_fd_sc_ms__and2b_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2b/sky130_fd_sc_ms__and2b_4.spice b/cells/and2b/sky130_fd_sc_ms__and2b_4.spice
index e12890c..667226e 100644
--- a/cells/and2b/sky130_fd_sc_ms__and2b_4.spice
+++ b/cells/and2b/sky130_fd_sc_ms__and2b_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ms__and2b_4 A_N B VGND VNB VPB VPWR X
-M1000 VPWR B a_221_424# VPB pshort w=840000u l=180000u
-+  ad=1.574e+12p pd=1.352e+07u as=4.536e+11p ps=4.44e+06u
-M1001 VGND a_221_424# X VNB nlowvt w=740000u l=150000u
-+  ad=9.074e+11p pd=8.29e+06u as=4.218e+11p ps=4.1e+06u
-M1002 X a_221_424# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1003 VPWR a_221_424# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_221_424# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_221_424# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_221_424# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_221_424# a_27_392# a_233_74# VNB nlowvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=4.16e+11p ps=3.86e+06u
-M1008 VPWR A_N a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1009 a_233_74# B VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A_N a_27_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1011 X a_221_424# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_221_424# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_233_74# a_27_392# a_221_424# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_221_424# a_27_392# VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B a_233_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_27_392# a_221_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_221_424# B VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_221_424# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_233_74# a_27_392# a_221_424# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 VPWR a_221_424# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 X a_221_424# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_27_392# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 VGND B a_233_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VPWR a_27_392# a_221_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 VPWR B a_221_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X8 a_233_74# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_27_392# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 X a_221_424# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 X a_221_424# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 VGND a_221_424# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 X a_221_424# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_221_424# a_27_392# a_233_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 a_221_424# a_27_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X16 a_221_424# B VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X17 VGND a_221_424# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/and3/sky130_fd_sc_ms__and3_1.cdl b/cells/and3/sky130_fd_sc_ms__and3_1.cdl
index 9559ffe..7eb2223 100644
--- a/cells/and3/sky130_fd_sc_ms__and3_1.cdl
+++ b/cells/and3/sky130_fd_sc_ms__and3_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8 m=1 w=1.12 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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and3_1
diff --git a/cells/and3/sky130_fd_sc_ms__and3_1.netlist.tsv b/cells/and3/sky130_fd_sc_ms__and3_1.netlist.tsv
index f9210c8..6f04542 100644
--- a/cells/and3/sky130_fd_sc_ms__and3_1.netlist.tsv
+++ b/cells/and3/sky130_fd_sc_ms__and3_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3/sky130_fd_sc_ms__and3_1.spice b/cells/and3/sky130_fd_sc_ms__and3_1.spice
index d083ed6..1dc3d91 100644
--- a/cells/and3/sky130_fd_sc_ms__and3_1.spice
+++ b/cells/and3/sky130_fd_sc_ms__and3_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__and3_1 A B C VGND VNB VPB VPWR X
-M1000 X a_27_398# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=1.00785e+12p ps=6.04e+06u
-M1001 a_121_136# A a_27_398# VNB nlowvt w=640000u l=150000u
-+  ad=2.624e+11p pd=2.1e+06u as=1.824e+11p ps=1.85e+06u
-M1002 a_233_136# B a_121_136# VNB nlowvt w=640000u l=150000u
-+  ad=2.22e+11p pd=2.09e+06u as=0p ps=0u
-M1003 a_27_398# B VPWR VPB pshort w=840000u l=180000u
-+  ad=4.62e+11p pd=4.46e+06u as=0p ps=0u
-M1004 VGND C a_233_136# VNB nlowvt w=640000u l=150000u
-+  ad=3.107e+11p pd=2.34e+06u as=0p ps=0u
-M1005 VPWR C a_27_398# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_27_398# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_27_398# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
+X0 a_121_136# B a_233_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 a_27_398# C VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 VGND a_27_398# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR a_27_398# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_27_398# A VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 VPWR B a_27_398# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X6 a_27_398# A a_121_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X7 a_233_136# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/and3/sky130_fd_sc_ms__and3_2.cdl b/cells/and3/sky130_fd_sc_ms__and3_2.cdl
index de4430e..1519fc3 100644
--- a/cells/and3/sky130_fd_sc_ms__and3_2.cdl
+++ b/cells/and3/sky130_fd_sc_ms__and3_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8 m=2 w=1.12 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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and3_2
diff --git a/cells/and3/sky130_fd_sc_ms__and3_2.netlist.tsv b/cells/and3/sky130_fd_sc_ms__and3_2.netlist.tsv
index 66b33a2..8bf5927 100644
--- a/cells/and3/sky130_fd_sc_ms__and3_2.netlist.tsv
+++ b/cells/and3/sky130_fd_sc_ms__and3_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3/sky130_fd_sc_ms__and3_2.spice b/cells/and3/sky130_fd_sc_ms__and3_2.spice
index 093f6cd..b98561e 100644
--- a/cells/and3/sky130_fd_sc_ms__and3_2.spice
+++ b/cells/and3/sky130_fd_sc_ms__and3_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__and3_2 A B C VGND VNB VPB VPWR X
-M1000 X a_41_384# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.368e+11p pd=2.12e+06u as=6.9565e+11p ps=5.12e+06u
-M1001 X a_41_384# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=1.2592e+12p ps=8.72e+06u
-M1002 VPWR a_41_384# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND C a_247_136# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1004 a_247_136# B a_133_136# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.688e+11p ps=2.12e+06u
-M1005 a_133_136# A a_41_384# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1006 VPWR A a_41_384# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=4.62e+11p ps=4.46e+06u
-M1007 a_41_384# B VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR C a_41_384# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_41_384# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_41_384# A VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 a_41_384# A a_133_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 VGND a_41_384# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_133_136# B a_247_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 VPWR B a_41_384# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 a_247_136# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 X a_41_384# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR a_41_384# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_41_384# C VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 X a_41_384# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/and3/sky130_fd_sc_ms__and3_4.cdl b/cells/and3/sky130_fd_sc_ms__and3_4.cdl
index 6250207..ac17925 100644
--- a/cells/and3/sky130_fd_sc_ms__and3_4.cdl
+++ b/cells/and3/sky130_fd_sc_ms__and3_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8 m=4 w=1.12 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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and3_4
diff --git a/cells/and3/sky130_fd_sc_ms__and3_4.netlist.tsv b/cells/and3/sky130_fd_sc_ms__and3_4.netlist.tsv
index a87fa05..98c7e30 100644
--- a/cells/and3/sky130_fd_sc_ms__and3_4.netlist.tsv
+++ b/cells/and3/sky130_fd_sc_ms__and3_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3/sky130_fd_sc_ms__and3_4.spice b/cells/and3/sky130_fd_sc_ms__and3_4.spice
index 4deaa03..6313b33 100644
--- a/cells/and3/sky130_fd_sc_ms__and3_4.spice
+++ b/cells/and3/sky130_fd_sc_ms__and3_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__and3_4 A B C VGND VNB VPB VPWR X
-M1000 a_686_74# B a_489_74# VNB nlowvt w=640000u l=150000u
-+  ad=5.76e+11p pd=5.64e+06u as=3.84e+11p ps=3.76e+06u
-M1001 VPWR B a_83_260# VPB pshort w=840000u l=180000u
-+  ad=2.184e+12p pd=1.636e+07u as=7.14e+11p ps=6.74e+06u
-M1002 a_489_74# B a_686_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_83_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1004 VPWR a_83_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_83_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_83_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_83_260# C VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR C a_83_260# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_489_74# C VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=9.013e+11p ps=8.26e+06u
-M1010 a_83_260# A a_686_74# VNB nlowvt w=640000u l=150000u
-+  ad=2.368e+11p pd=2.02e+06u as=0p ps=0u
-M1011 VGND a_83_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1012 a_83_260# A VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_83_260# B VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND C a_489_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_83_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A a_83_260# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_83_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_83_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_686_74# A a_83_260# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_83_260# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_83_260# A VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 a_83_260# B VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X4 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VGND C a_489_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VPWR C a_83_260# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 a_686_74# B a_489_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_83_260# A a_686_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_489_74# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 a_489_74# B a_686_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VPWR B a_83_260# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X14 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_686_74# A a_83_260# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X18 a_83_260# C VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X19 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/and3b/sky130_fd_sc_ms__and3b_1.cdl b/cells/and3b/sky130_fd_sc_ms__and3b_1.cdl
index f6f86b4..77078c4 100644
--- a/cells/and3b/sky130_fd_sc_ms__and3b_1.cdl
+++ b/cells/and3b/sky130_fd_sc_ms__and3b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X y VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and3b_1
diff --git a/cells/and3b/sky130_fd_sc_ms__and3b_1.netlist.tsv b/cells/and3b/sky130_fd_sc_ms__and3b_1.netlist.tsv
index 4985331..571ab02 100644
--- a/cells/and3b/sky130_fd_sc_ms__and3b_1.netlist.tsv
+++ b/cells/and3b/sky130_fd_sc_ms__and3b_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3b/sky130_fd_sc_ms__and3b_1.spice b/cells/and3b/sky130_fd_sc_ms__and3b_1.spice
index 4951fc7..fd8facb 100644
--- a/cells/and3b/sky130_fd_sc_ms__and3b_1.spice
+++ b/cells/and3b/sky130_fd_sc_ms__and3b_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__and3b_1 A_N B C VGND VNB VPB VPWR X
-M1000 a_266_94# B VPWR VPB pshort w=840000u l=180000u
-+  ad=4.662e+11p pd=4.47e+06u as=9.786e+11p ps=7.71e+06u
-M1001 X a_266_94# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1002 a_114_74# A_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.73e+11p pd=2.33e+06u as=0p ps=0u
-M1003 X a_266_94# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=5.5385e+11p ps=4.28e+06u
-M1004 a_353_94# a_114_74# a_266_94# VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.824e+11p ps=1.85e+06u
-M1005 a_431_94# B a_353_94# VNB nlowvt w=640000u l=150000u
-+  ad=2.496e+11p pd=2.06e+06u as=0p ps=0u
-M1006 a_114_74# A_N VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.9525e+11p pd=1.81e+06u as=0p ps=0u
-M1007 VGND C a_431_94# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR C a_266_94# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_114_74# a_266_94# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_431_94# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 VPWR A_N a_114_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 a_266_94# a_114_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 VPWR a_266_94# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_353_94# B a_431_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 VPWR B a_266_94# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X6 a_266_94# a_114_74# a_353_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X7 VGND a_266_94# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_266_94# C VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 VGND A_N a_114_74# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
 .ends
diff --git a/cells/and3b/sky130_fd_sc_ms__and3b_2.cdl b/cells/and3b/sky130_fd_sc_ms__and3b_2.cdl
index 04e500e..d5515b1 100644
--- a/cells/and3b/sky130_fd_sc_ms__and3b_2.cdl
+++ b/cells/and3b/sky130_fd_sc_ms__and3b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=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 pshort m=1 w=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 pshort m=1 w=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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X y VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and3b_2
diff --git a/cells/and3b/sky130_fd_sc_ms__and3b_2.netlist.tsv b/cells/and3b/sky130_fd_sc_ms__and3b_2.netlist.tsv
index 59fbc0e..07e29e8 100644
--- a/cells/and3b/sky130_fd_sc_ms__and3b_2.netlist.tsv
+++ b/cells/and3b/sky130_fd_sc_ms__and3b_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	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	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	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	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3b/sky130_fd_sc_ms__and3b_2.spice b/cells/and3b/sky130_fd_sc_ms__and3b_2.spice
index 958d2ee..e54c85c 100644
--- a/cells/and3b/sky130_fd_sc_ms__and3b_2.spice
+++ b/cells/and3b/sky130_fd_sc_ms__and3b_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__and3b_2 A_N B C VGND VNB VPB VPWR X
-M1000 VGND C a_454_74# VNB nlowvt w=740000u l=150000u
-+  ad=6.8395e+11p pd=6.06e+06u as=3.108e+11p ps=2.32e+06u
-M1001 a_284_368# B VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.5e+11p pd=5.1e+06u as=1.3408e+12p ps=1.08e+07u
-M1002 VPWR a_27_88# a_284_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR C a_284_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_284_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1005 VPWR A_N a_27_88# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1006 a_454_74# B a_376_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1007 X a_284_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.192e+11p pd=2.81e+06u as=0p ps=0u
-M1008 a_376_74# a_27_88# a_284_368# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1009 VGND A_N a_27_88# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1010 VGND a_284_368# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_284_368# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_284_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR a_284_368# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_454_74# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_284_368# a_27_88# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VPWR B a_284_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_27_88# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X6 X a_284_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VGND a_284_368# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_376_74# B a_454_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_284_368# C VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_27_88# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X11 a_284_368# a_27_88# a_376_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/and3b/sky130_fd_sc_ms__and3b_4.cdl b/cells/and3b/sky130_fd_sc_ms__and3b_4.cdl
index 0057cd2..d249239 100644
--- a/cells/and3b/sky130_fd_sc_ms__and3b_4.cdl
+++ b/cells/and3b/sky130_fd_sc_ms__and3b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=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 pshort m=2 w=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 pshort m=2 w=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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8 m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X y VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and3b_4
diff --git a/cells/and3b/sky130_fd_sc_ms__and3b_4.netlist.tsv b/cells/and3b/sky130_fd_sc_ms__and3b_4.netlist.tsv
index 3ea599e..23ef7fb 100644
--- a/cells/and3b/sky130_fd_sc_ms__and3b_4.netlist.tsv
+++ b/cells/and3b/sky130_fd_sc_ms__and3b_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	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	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3b/sky130_fd_sc_ms__and3b_4.spice b/cells/and3b/sky130_fd_sc_ms__and3b_4.spice
index 062e3dd..cda3671 100644
--- a/cells/and3b/sky130_fd_sc_ms__and3b_4.spice
+++ b/cells/and3b/sky130_fd_sc_ms__and3b_4.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ms__and3b_4 A_N B C VGND VNB VPB VPWR X
-M1000 VPWR A_N a_27_74# VPB pshort w=1e+06u l=180000u
-+  ad=2.3986e+12p pd=1.727e+07u as=2.8e+11p ps=2.56e+06u
-M1001 VPWR a_301_368# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=6.048e+11p ps=5.56e+06u
-M1002 a_239_98# a_27_74# a_301_368# VNB nlowvt w=640000u l=150000u
-+  ad=5.44e+11p pd=5.54e+06u as=1.792e+11p ps=1.84e+06u
-M1003 a_498_98# C VGND VNB nlowvt w=640000u l=150000u
-+  ad=4.032e+11p pd=3.82e+06u as=1.063e+12p ps=1.005e+07u
-M1004 VGND a_301_368# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.662e+11p ps=4.22e+06u
-M1005 a_301_368# C VPWR VPB pshort w=1e+06u l=180000u
-+  ad=8.1e+11p pd=7.62e+06u as=0p ps=0u
-M1006 VPWR C a_301_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_301_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_301_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND C a_498_98# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_239_98# B a_498_98# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_498_98# B a_239_98# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_301_368# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_301_368# a_27_74# a_239_98# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_301_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_301_368# B VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_301_368# a_27_74# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_301_368# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A_N a_27_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1019 VPWR B a_301_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_27_74# a_301_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_301_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_301_368# C VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_239_98# B a_498_98# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 VPWR a_301_368# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VPWR a_301_368# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_301_368# a_27_74# a_239_98# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_301_368# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 VPWR a_27_74# a_301_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VGND C a_498_98# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_27_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 VPWR C a_301_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_498_98# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 X a_301_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 X a_301_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VGND a_301_368# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VPWR B a_301_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X15 VGND a_301_368# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_498_98# B a_239_98# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 a_301_368# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 a_27_74# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X19 a_239_98# a_27_74# a_301_368# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X20 X a_301_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 X a_301_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/and4/sky130_fd_sc_ms__and4_1.cdl b/cells/and4/sky130_fd_sc_ms__and4_1.cdl
index cf861fc..f7f3b2f 100644
--- a/cells/and4/sky130_fd_sc_ms__and4_1.cdl
+++ b/cells/and4/sky130_fd_sc_ms__and4_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP3 y D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8 m=1 w=1.12 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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and4_1
diff --git a/cells/and4/sky130_fd_sc_ms__and4_1.netlist.tsv b/cells/and4/sky130_fd_sc_ms__and4_1.netlist.tsv
index 6f6c5c4..d6f55ef 100644
--- a/cells/and4/sky130_fd_sc_ms__and4_1.netlist.tsv
+++ b/cells/and4/sky130_fd_sc_ms__and4_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4/sky130_fd_sc_ms__and4_1.spice b/cells/and4/sky130_fd_sc_ms__and4_1.spice
index 9b6424f..3284935 100644
--- a/cells/and4/sky130_fd_sc_ms__and4_1.spice
+++ b/cells/and4/sky130_fd_sc_ms__and4_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__and4_1 A B C D VGND VNB VPB VPWR X
-M1000 VPWR B a_96_74# VPB pshort w=840000u l=180000u
-+  ad=1.1326e+12p pd=8.13e+06u as=5.376e+11p ps=4.64e+06u
-M1001 VPWR D a_96_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_96_74# C VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND D a_335_74# VNB nlowvt w=640000u l=150000u
-+  ad=2.554e+11p pd=2.2e+06u as=2.688e+11p ps=2.12e+06u
-M1004 a_96_74# A VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_96_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1006 X a_96_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1007 a_257_74# B a_179_74# VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.536e+11p ps=1.76e+06u
-M1008 a_335_74# C a_257_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_179_74# A a_96_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
+X0 VPWR A a_96_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 a_335_74# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_96_74# B VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 VPWR C a_96_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X4 a_96_74# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 a_257_74# C a_335_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VPWR a_96_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_179_74# B a_257_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_96_74# A a_179_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 VGND a_96_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/and4/sky130_fd_sc_ms__and4_2.cdl b/cells/and4/sky130_fd_sc_ms__and4_2.cdl
index 2df425f..ce5300a 100644
--- a/cells/and4/sky130_fd_sc_ms__and4_2.cdl
+++ b/cells/and4/sky130_fd_sc_ms__and4_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=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 pshort m=1 w=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 pshort m=1 w=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 pshort m=1 w=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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8 m=2 w=1.12 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_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and4_2
diff --git a/cells/and4/sky130_fd_sc_ms__and4_2.netlist.tsv b/cells/and4/sky130_fd_sc_ms__and4_2.netlist.tsv
index eaeabdf..4519a7b 100644
--- a/cells/and4/sky130_fd_sc_ms__and4_2.netlist.tsv
+++ b/cells/and4/sky130_fd_sc_ms__and4_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	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	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	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	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4/sky130_fd_sc_ms__and4_2.spice b/cells/and4/sky130_fd_sc_ms__and4_2.spice
index fb28e48..1e0493e 100644
--- a/cells/and4/sky130_fd_sc_ms__and4_2.spice
+++ b/cells/and4/sky130_fd_sc_ms__and4_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__and4_2 A B C D VGND VNB VPB VPWR X
-M1000 a_221_74# B a_143_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=1.776e+11p ps=1.96e+06u
-M1001 a_56_74# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=1.7568e+12p ps=1.184e+07u
-M1002 VGND a_56_74# X VNB nlowvt w=740000u l=150000u
-+  ad=5.846e+11p pd=4.54e+06u as=2.072e+11p ps=2.04e+06u
-M1003 VPWR B a_56_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND D a_335_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=3.108e+11p ps=2.32e+06u
-M1005 a_143_74# A a_56_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1006 a_56_74# C VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR D a_56_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_56_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_56_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1010 VPWR a_56_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_335_74# C a_221_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_335_74# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_56_74# D VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 X a_56_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VPWR A a_56_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_143_74# B a_221_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_56_74# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_56_74# A a_143_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR C a_56_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 VPWR a_56_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 X a_56_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND a_56_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_221_74# C a_335_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/and4/sky130_fd_sc_ms__and4_4.cdl b/cells/and4/sky130_fd_sc_ms__and4_4.cdl
index a86cc48..06b6381 100644
--- a/cells/and4/sky130_fd_sc_ms__and4_4.cdl
+++ b/cells/and4/sky130_fd_sc_ms__and4_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=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 pshort m=2 w=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 pshort m=2 w=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 pshort m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8 m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8 m=2 w=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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8 m=4 w=1.12 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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and4_4
diff --git a/cells/and4/sky130_fd_sc_ms__and4_4.netlist.tsv b/cells/and4/sky130_fd_sc_ms__and4_4.netlist.tsv
index 44a190e..cf3e920 100644
--- a/cells/and4/sky130_fd_sc_ms__and4_4.netlist.tsv
+++ b/cells/and4/sky130_fd_sc_ms__and4_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__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	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	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	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4/sky130_fd_sc_ms__and4_4.spice b/cells/and4/sky130_fd_sc_ms__and4_4.spice
index 0e6431d..768169d 100644
--- a/cells/and4/sky130_fd_sc_ms__and4_4.spice
+++ b/cells/and4/sky130_fd_sc_ms__and4_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__and4_4 A B C D VGND VNB VPB VPWR X
-M1000 X a_119_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.608e+11p pd=5.66e+06u as=2.657e+12p ps=1.983e+07u
-M1001 a_119_392# B VPWR VPB pshort w=1e+06u l=180000u
-+  ad=1.145e+12p pd=1.029e+07u as=0p ps=0u
-M1002 VPWR A a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_119_392# A a_119_119# VNB nlowvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=3.584e+11p ps=3.68e+06u
-M1004 a_119_392# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_119_119# B a_32_119# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=5.321e+11p ps=5.54e+06u
-M1006 a_119_119# A a_119_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_119_392# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_119_392# X VNB nlowvt w=740000u l=150000u
-+  ad=1.05515e+12p pd=8.94e+06u as=4.366e+11p ps=4.14e+06u
-M1009 X a_119_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_119_392# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR C a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_119_392# D VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_119_392# C VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR B a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR D a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND D a_463_119# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.584e+11p ps=3.68e+06u
-M1017 X a_119_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_32_119# B a_119_119# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_463_119# C a_32_119# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_463_119# D VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_32_119# C a_463_119# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_119_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_119_392# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_119_392# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VPWR A a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_463_119# C a_32_119# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 VPWR a_119_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_463_119# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_32_119# C a_463_119# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VGND a_119_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR C a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 VPWR D a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 X a_119_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 X a_119_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_32_119# B a_119_119# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 a_119_392# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 VGND a_119_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 X a_119_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_119_392# C VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 X a_119_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_119_119# A a_119_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X18 a_119_392# D VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X19 VGND D a_463_119# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X20 VPWR a_119_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 a_119_119# B a_32_119# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X22 VPWR B a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X23 a_119_392# A a_119_119# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/and4b/sky130_fd_sc_ms__and4b_1.cdl b/cells/and4b/sky130_fd_sc_ms__and4b_1.cdl
index ab6f11e..fd018b7 100644
--- a/cells/and4b/sky130_fd_sc_ms__and4b_1.cdl
+++ b/cells/and4b/sky130_fd_sc_ms__and4b_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP3 y D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X y VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and4b_1
diff --git a/cells/and4b/sky130_fd_sc_ms__and4b_1.netlist.tsv b/cells/and4b/sky130_fd_sc_ms__and4b_1.netlist.tsv
index 816bcd9..b073438 100644
--- a/cells/and4b/sky130_fd_sc_ms__and4b_1.netlist.tsv
+++ b/cells/and4b/sky130_fd_sc_ms__and4b_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__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	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4b/sky130_fd_sc_ms__and4b_1.spice b/cells/and4b/sky130_fd_sc_ms__and4b_1.spice
index 09b1c23..2fa9bdc 100644
--- a/cells/and4b/sky130_fd_sc_ms__and4b_1.spice
+++ b/cells/and4b/sky130_fd_sc_ms__and4b_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__and4b_1 A_N B C D VGND VNB VPB VPWR X
-M1000 VGND D a_526_139# VNB nlowvt w=640000u l=150000u
-+  ad=4.5645e+11p pd=3.97e+06u as=3.418e+11p ps=2.55e+06u
-M1001 a_448_139# B a_353_124# VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=2.21125e+11p ps=2.08e+06u
-M1002 a_229_424# a_27_74# VPWR VPB pshort w=840000u l=180000u
-+  ad=5.628e+11p pd=4.7e+06u as=1.5316e+12p ps=9.08e+06u
-M1003 a_353_124# a_27_74# a_229_424# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1004 VPWR A_N a_27_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1005 X a_229_424# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1006 VPWR B a_229_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A_N a_27_74# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1008 VPWR D a_229_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_229_424# C VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_229_424# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1011 a_526_139# C a_448_139# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_526_139# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 a_229_424# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 VPWR a_229_424# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_353_124# B a_448_139# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 VGND a_229_424# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_448_139# C a_526_139# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VPWR a_27_74# a_229_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 a_27_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X8 a_229_424# B VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 a_229_424# a_27_74# a_353_124# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 VPWR C a_229_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X11 a_27_74# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
 .ends
diff --git a/cells/and4b/sky130_fd_sc_ms__and4b_2.cdl b/cells/and4b/sky130_fd_sc_ms__and4b_2.cdl
index ea16411..d600291 100644
--- a/cells/and4b/sky130_fd_sc_ms__and4b_2.cdl
+++ b/cells/and4b/sky130_fd_sc_ms__and4b_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=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 pshort m=1 w=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 pshort m=1 w=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 pshort m=1 w=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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X y VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and4b_2
diff --git a/cells/and4b/sky130_fd_sc_ms__and4b_2.netlist.tsv b/cells/and4b/sky130_fd_sc_ms__and4b_2.netlist.tsv
index eadb8fe..d6f442a 100644
--- a/cells/and4b/sky130_fd_sc_ms__and4b_2.netlist.tsv
+++ b/cells/and4b/sky130_fd_sc_ms__and4b_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	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	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	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	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	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4b/sky130_fd_sc_ms__and4b_2.spice b/cells/and4b/sky130_fd_sc_ms__and4b_2.spice
index 213dc52..2ba4996 100644
--- a/cells/and4b/sky130_fd_sc_ms__and4b_2.spice
+++ b/cells/and4b/sky130_fd_sc_ms__and4b_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__and4b_2 A_N B C D VGND VNB VPB VPWR X
-M1000 a_459_74# D VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=7.2205e+11p ps=4.95e+06u
-M1001 a_537_74# C a_459_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=0p ps=0u
-M1002 a_186_48# D VPWR VPB pshort w=1e+06u l=180000u
-+  ad=6.05e+11p pd=5.21e+06u as=1.75605e+12p ps=1.211e+07u
-M1003 a_186_48# B VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_186_48# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1005 VPWR A_N a_27_112# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1006 VPWR C a_186_48# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_186_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1008 a_645_74# B a_537_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=0p ps=0u
-M1009 VPWR a_186_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A_N a_27_112# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1011 VPWR a_27_112# a_186_48# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_186_48# a_27_112# a_645_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1013 X a_186_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_186_48# a_27_112# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_459_74# C a_537_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VGND D a_459_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_537_74# B a_645_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_645_74# a_27_112# a_186_48# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 X a_186_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VPWR B a_186_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VGND a_186_48# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_27_112# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 VPWR D a_186_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_27_112# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X11 VPWR a_186_48# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_186_48# C VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 X a_186_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/and4b/sky130_fd_sc_ms__and4b_4.cdl b/cells/and4b/sky130_fd_sc_ms__and4b_4.cdl
index d0caea8..2c60c84 100644
--- a/cells/and4b/sky130_fd_sc_ms__and4b_4.cdl
+++ b/cells/and4b/sky130_fd_sc_ms__and4b_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=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 pshort m=2 w=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 pshort m=2 w=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 pshort m=2 w=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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8 m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8 m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X y VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and4b_4
diff --git a/cells/and4b/sky130_fd_sc_ms__and4b_4.netlist.tsv b/cells/and4b/sky130_fd_sc_ms__and4b_4.netlist.tsv
index fade3ae..cb30b6e 100644
--- a/cells/and4b/sky130_fd_sc_ms__and4b_4.netlist.tsv
+++ b/cells/and4b/sky130_fd_sc_ms__and4b_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__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	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	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	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4b/sky130_fd_sc_ms__and4b_4.spice b/cells/and4b/sky130_fd_sc_ms__and4b_4.spice
index 1e90f77..b8ad17a 100644
--- a/cells/and4b/sky130_fd_sc_ms__and4b_4.spice
+++ b/cells/and4b/sky130_fd_sc_ms__and4b_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_ms__and4b_4 A_N B C D VGND VNB VPB VPWR X
-M1000 a_664_125# C a_751_125# VNB nlowvt w=640000u l=150000u
-+  ad=5.37125e+11p pd=5.53e+06u as=3.872e+11p ps=3.77e+06u
-M1001 VPWR a_199_294# X VPB pshort w=1.12e+06u l=180000u
-+  ad=2.605e+12p pd=1.972e+07u as=7.28e+11p ps=5.78e+06u
-M1002 a_664_125# B a_1136_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=4.992e+11p ps=4.12e+06u
-M1003 a_199_294# D VPWR VPB pshort w=1e+06u l=180000u
-+  ad=1.64e+12p pd=1.128e+07u as=0p ps=0u
-M1004 VPWR A_N a_27_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1005 VGND a_199_294# X VNB nlowvt w=740000u l=150000u
-+  ad=1.25925e+12p pd=9.57e+06u as=4.144e+11p ps=4.08e+06u
-M1006 a_199_294# B VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND D a_751_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_27_368# a_199_294# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_199_294# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_199_294# C VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A_N a_27_368# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1012 a_199_294# a_27_368# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1136_125# a_27_368# a_199_294# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1014 X a_199_294# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_199_294# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_751_125# C a_664_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_199_294# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR B a_199_294# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1136_125# B a_664_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR D a_199_294# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_751_125# D VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_199_294# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_199_294# a_27_368# a_1136_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR C a_199_294# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_199_294# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B a_199_294# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VPWR D a_199_294# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_199_294# a_27_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 a_751_125# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 VPWR C a_199_294# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_199_294# D VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_199_294# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VGND a_199_294# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VGND a_199_294# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_664_125# C a_751_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 VPWR a_199_294# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 X a_199_294# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_1136_125# a_27_368# a_199_294# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 a_199_294# a_27_368# a_1136_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 a_1136_125# B a_664_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 a_27_368# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 a_27_368# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 X a_199_294# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 VPWR a_27_368# a_199_294# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X19 a_199_294# C VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X20 a_664_125# B a_1136_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X21 a_751_125# C a_664_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X22 VGND D a_751_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X23 VPWR a_199_294# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 X a_199_294# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 X a_199_294# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/and4bb/sky130_fd_sc_ms__and4bb_1.cdl b/cells/and4bb/sky130_fd_sc_ms__and4bb_1.cdl
index 2a63136..67f64c1 100644
--- a/cells/and4bb/sky130_fd_sc_ms__and4bb_1.cdl
+++ b/cells/and4bb/sky130_fd_sc_ms__and4bb_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP3 y D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 B B_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and4bb_1
diff --git a/cells/and4bb/sky130_fd_sc_ms__and4bb_1.netlist.tsv b/cells/and4bb/sky130_fd_sc_ms__and4bb_1.netlist.tsv
index 742e96e..baa47e1 100644
--- a/cells/and4bb/sky130_fd_sc_ms__and4bb_1.netlist.tsv
+++ b/cells/and4bb/sky130_fd_sc_ms__and4bb_1.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ms__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	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4bb/sky130_fd_sc_ms__and4bb_1.spice b/cells/and4bb/sky130_fd_sc_ms__and4bb_1.spice
index efe2092..61ba081 100644
--- a/cells/and4bb/sky130_fd_sc_ms__and4bb_1.spice
+++ b/cells/and4bb/sky130_fd_sc_ms__and4bb_1.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__and4bb_1 A_N B_N C D VGND VNB VPB VPWR X
-M1000 VGND D a_647_74# VNB nlowvt w=640000u l=150000u
-+  ad=5.299e+11p pd=4.38e+06u as=2.304e+11p ps=2e+06u
-M1001 X a_179_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1002 VPWR A_N a_27_74# VPB pshort w=840000u l=180000u
-+  ad=1.2502e+12p pd=1.007e+07u as=2.352e+11p ps=2.24e+06u
-M1003 a_455_74# a_27_74# a_179_48# VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.824e+11p ps=1.85e+06u
-M1004 a_533_74# a_503_48# a_455_74# VNB nlowvt w=640000u l=150000u
-+  ad=2.688e+11p pd=2.12e+06u as=0p ps=0u
-M1005 a_179_48# C VPWR VPB pshort w=840000u l=180000u
-+  ad=4.956e+11p pd=4.54e+06u as=0p ps=0u
-M1006 VPWR D a_179_48# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_503_48# a_179_48# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_179_48# a_27_74# VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_503_48# B_N VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1010 a_503_48# B_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1011 a_647_74# C a_533_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_179_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=4.648e+11p pd=3.07e+06u as=0p ps=0u
-M1013 VGND A_N a_27_74# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
+X0 VGND a_179_48# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_179_48# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 VPWR a_179_48# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_647_74# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 VGND B_N a_503_48# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X5 VPWR a_27_74# a_179_48# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X6 a_27_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 VPWR C a_179_48# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X8 a_455_74# a_503_48# a_533_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_179_48# a_27_74# a_455_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_179_48# a_503_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X11 VPWR B_N a_503_48# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X12 a_533_74# C a_647_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 a_27_74# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
 .ends
diff --git a/cells/and4bb/sky130_fd_sc_ms__and4bb_2.cdl b/cells/and4bb/sky130_fd_sc_ms__and4bb_2.cdl
index 520e42e..be79aee 100644
--- a/cells/and4bb/sky130_fd_sc_ms__and4bb_2.cdl
+++ b/cells/and4bb/sky130_fd_sc_ms__and4bb_2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=1 w=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 pshort m=1 w=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 pshort m=1 w=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 pshort m=1 w=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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 B B_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and4bb_2
diff --git a/cells/and4bb/sky130_fd_sc_ms__and4bb_2.netlist.tsv b/cells/and4bb/sky130_fd_sc_ms__and4bb_2.netlist.tsv
index ccd7db0..95cfb9c 100644
--- a/cells/and4bb/sky130_fd_sc_ms__and4bb_2.netlist.tsv
+++ b/cells/and4bb/sky130_fd_sc_ms__and4bb_2.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ms__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	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	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	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	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	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	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4bb/sky130_fd_sc_ms__and4bb_2.spice b/cells/and4bb/sky130_fd_sc_ms__and4bb_2.spice
index 04ca125..27f4347 100644
--- a/cells/and4bb/sky130_fd_sc_ms__and4bb_2.spice
+++ b/cells/and4bb/sky130_fd_sc_ms__and4bb_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ms__and4bb_2 A_N B_N C D VGND VNB VPB VPWR X
-M1000 a_225_82# C VPWR VPB pshort w=1e+06u l=180000u
-+  ad=8.1e+11p pd=5.62e+06u as=1.854e+12p ps=1.212e+07u
-M1001 VPWR D a_225_82# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_390_82# a_354_252# a_312_82# VNB nlowvt w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=1.776e+11p ps=1.96e+06u
-M1003 X a_225_82# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=1.0454e+12p ps=7.35e+06u
-M1004 a_312_82# a_27_74# a_225_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1005 a_354_252# B_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1006 a_354_252# B_N VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1007 VGND a_225_82# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_225_82# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1009 VPWR a_225_82# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_498_82# C a_390_82# VNB nlowvt w=740000u l=150000u
-+  ad=2.664e+11p pd=2.2e+06u as=0p ps=0u
-M1011 VGND D a_498_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_354_252# a_225_82# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_225_82# a_27_74# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A_N a_27_74# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1015 VPWR A_N a_27_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
+X0 a_27_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 VPWR B_N a_354_252# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 VPWR a_225_82# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VPWR a_27_74# a_225_82# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_225_82# D VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_498_82# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VGND B_N a_354_252# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X7 a_390_82# C a_498_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 X a_225_82# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VPWR C a_225_82# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 VGND a_225_82# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_312_82# a_354_252# a_390_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_225_82# a_354_252# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 a_225_82# a_27_74# a_312_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_27_74# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X15 X a_225_82# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/and4bb/sky130_fd_sc_ms__and4bb_4.cdl b/cells/and4bb/sky130_fd_sc_ms__and4bb_4.cdl
index 31adf62..aceaf60 100644
--- a/cells/and4bb/sky130_fd_sc_ms__and4bb_4.cdl
+++ b/cells/and4bb/sky130_fd_sc_ms__and4bb_4.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ms__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 pshort m=2 w=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 pshort m=2 w=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 pshort m=2 w=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 pshort m=2 w=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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8 m=2 w=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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8 m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8 m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 B B_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__and4bb_4
diff --git a/cells/and4bb/sky130_fd_sc_ms__and4bb_4.netlist.tsv b/cells/and4bb/sky130_fd_sc_ms__and4bb_4.netlist.tsv
index ce99378..13a0e4d 100644
--- a/cells/and4bb/sky130_fd_sc_ms__and4bb_4.netlist.tsv
+++ b/cells/and4bb/sky130_fd_sc_ms__and4bb_4.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ms__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	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8	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	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4bb/sky130_fd_sc_ms__and4bb_4.spice b/cells/and4bb/sky130_fd_sc_ms__and4bb_4.spice
index 02f173e..f05c776 100644
--- a/cells/and4bb/sky130_fd_sc_ms__and4bb_4.spice
+++ b/cells/and4bb/sky130_fd_sc_ms__and4bb_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__and4bb_4 A_N B_N C D VGND VNB VPB VPWR X
-M1000 a_685_140# a_27_74# a_412_140# VNB nlowvt w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=5.888e+11p ps=5.68e+06u
-M1001 a_685_140# C a_882_137# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=5.888e+11p ps=5.68e+06u
-M1002 a_412_140# a_27_74# a_685_140# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR B_N a_27_74# VPB pshort w=1e+06u l=180000u
-+  ad=3.5296e+12p pd=2.358e+07u as=2.8e+11p ps=2.56e+06u
-M1004 a_475_388# D VPWR VPB pshort w=1e+06u l=180000u
-+  ad=1.3525e+12p pd=1.087e+07u as=0p ps=0u
-M1005 X a_475_388# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1006 VPWR a_475_388# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_475_388# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_475_388# X VNB nlowvt w=740000u l=150000u
-+  ad=1.1064e+12p pd=1.017e+07u as=4.44e+11p ps=4.16e+06u
-M1009 a_475_388# a_200_74# a_412_140# VNB nlowvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1010 VGND D a_882_137# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_475_388# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_475_388# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_475_388# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR D a_475_388# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_475_388# a_200_74# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_475_388# C VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_200_74# a_475_388# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR C a_475_388# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_27_74# a_475_388# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_475_388# a_27_74# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_475_388# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_200_74# A_N VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1023 VGND B_N a_27_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1024 a_200_74# A_N VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.915e+11p pd=1.99e+06u as=0p ps=0u
-M1025 a_882_137# C a_685_140# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_882_137# D VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_412_140# a_200_74# a_475_388# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_475_388# C VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 X a_475_388# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VGND a_475_388# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_685_140# a_27_74# a_412_140# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_685_140# C a_882_137# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 VGND A_N a_200_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VGND a_475_388# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VGND D a_882_137# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 VPWR a_475_388# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VPWR D a_475_388# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 VPWR C a_475_388# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 X a_475_388# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VPWR a_200_74# a_475_388# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 VPWR a_475_388# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_882_137# C a_685_140# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 a_475_388# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 a_882_137# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 VPWR a_27_74# a_475_388# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 a_475_388# a_200_74# a_412_140# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X19 a_412_140# a_200_74# a_475_388# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X20 a_475_388# a_200_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X21 VPWR A_N a_200_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X22 a_27_74# B_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X23 a_27_74# B_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X24 a_412_140# a_27_74# a_685_140# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X25 X a_475_388# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 a_475_388# D VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X27 X a_475_388# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_ms__buf_1.cdl b/cells/buf/sky130_fd_sc_ms__buf_1.cdl
index e8331ed..dee5fa9 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_1.cdl
+++ b/cells/buf/sky130_fd_sc_ms__buf_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ms__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 nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X Ab VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X Ab VPB pfet_01v8 m=1 w=1.12 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_ms__buf_1
diff --git a/cells/buf/sky130_fd_sc_ms__buf_1.netlist.tsv b/cells/buf/sky130_fd_sc_ms__buf_1.netlist.tsv
index 8a8474c..f6953c6 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_1.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_ms__buf_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ms__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	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_ms__buf_1.spice b/cells/buf/sky130_fd_sc_ms__buf_1.spice
index 834c485..05c6a6a 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_1.spice
+++ b/cells/buf/sky130_fd_sc_ms__buf_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_ms__buf_1 A VGND VNB VPB VPWR X
-M1000 X a_27_164# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=3.808e+11p ps=2.98e+06u
-M1001 VPWR A a_27_164# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1002 VGND A a_27_164# VNB nlowvt w=550000u l=150000u
-+  ad=3.0395e+11p pd=2.34e+06u as=2.4915e+11p ps=2.37e+06u
-M1003 X a_27_164# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
+X0 VGND a_27_164# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_27_164# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X2 a_27_164# A VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 VPWR a_27_164# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_ms__buf_16.cdl b/cells/buf/sky130_fd_sc_ms__buf_16.cdl
index 8bdbc6b..0c90521 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_16.cdl
+++ b/cells/buf/sky130_fd_sc_ms__buf_16.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ms__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 nlowvt m=6 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8_lvt m=6 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X Ab VNB nfet_01v8_lvt m=16 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8 m=6 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nlowvt m=16 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pshort m=6 w=1.12 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 pshort m=16 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X Ab VPB pfet_01v8 m=16 w=1.12 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_ms__buf_16
diff --git a/cells/buf/sky130_fd_sc_ms__buf_16.netlist.tsv b/cells/buf/sky130_fd_sc_ms__buf_16.netlist.tsv
index 4cb4059..7770698 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_16.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_ms__buf_16.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ms__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	nlowvt	6	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nlowvt	16	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	pshort	6	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	pshort	16	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	6	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8_lvt	16	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	6	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8	16	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_ms__buf_16.spice b/cells/buf/sky130_fd_sc_ms__buf_16.spice
index fc1bd92..9a87711 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_16.spice
+++ b/cells/buf/sky130_fd_sc_ms__buf_16.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_ms__buf_16 A VGND VNB VPB VPWR X
-M1000 a_83_260# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=6.734e+11p pd=6.26e+06u as=2.8305e+12p ps=2.541e+07u
-M1001 X a_83_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.6576e+12p pd=1.632e+07u as=0p ps=0u
-M1002 VGND a_83_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A a_83_260# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR a_83_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=3.7632e+12p pd=3.36e+07u as=2.4192e+12p ps=2.224e+07u
-M1005 X a_83_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_83_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_83_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_83_260# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_83_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_83_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_83_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_83_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A a_83_260# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_83_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A a_83_260# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_83_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_83_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_83_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_83_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_83_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_83_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_83_260# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=9.072e+11p pd=8.34e+06u as=0p ps=0u
-M1023 VGND a_83_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR A a_83_260# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_83_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 X a_83_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_83_260# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_83_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 X a_83_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND a_83_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR A a_83_260# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 X a_83_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_83_260# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR a_83_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_83_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 X a_83_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND a_83_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR A a_83_260# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND a_83_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 X a_83_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 X a_83_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VGND a_83_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_83_260# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_83_260# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_83_260# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 VGND A a_83_260# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 VGND A a_83_260# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 a_83_260# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 a_83_260# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 VPWR A a_83_260# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X30 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 VPWR A a_83_260# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X33 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 a_83_260# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X35 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X36 VPWR A a_83_260# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X37 VGND A a_83_260# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X38 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X39 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X40 a_83_260# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X41 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X42 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X43 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_ms__buf_2.cdl b/cells/buf/sky130_fd_sc_ms__buf_2.cdl
index 4b5b1fa..4548c39 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_2.cdl
+++ b/cells/buf/sky130_fd_sc_ms__buf_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ms__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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X Ab VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pshort m=1 w=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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X Ab VPB pfet_01v8 m=2 w=1.12 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_ms__buf_2
diff --git a/cells/buf/sky130_fd_sc_ms__buf_2.netlist.tsv b/cells/buf/sky130_fd_sc_ms__buf_2.netlist.tsv
index 8b1c77c..4182a32 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_2.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_ms__buf_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ms__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	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_ms__buf_2.spice b/cells/buf/sky130_fd_sc_ms__buf_2.spice
index 6958074..9effeb9 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_2.spice
+++ b/cells/buf/sky130_fd_sc_ms__buf_2.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ms__buf_2 A VGND VNB VPB VPWR X
-M1000 X a_21_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=1.1278e+12p ps=6.51e+06u
-M1001 VPWR a_21_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND a_21_260# X VNB nlowvt w=740000u l=150000u
-+  ad=5.216e+11p pd=4.39e+06u as=2.072e+11p ps=2.04e+06u
-M1003 a_21_260# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1004 a_21_260# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=3.05e+11p pd=2.61e+06u as=0p ps=0u
-M1005 X a_21_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_21_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VGND A a_21_260# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 VGND a_21_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR a_21_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR A a_21_260# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 X a_21_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_ms__buf_4.cdl b/cells/buf/sky130_fd_sc_ms__buf_4.cdl
index 3c552a7..7970dfa 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_4.cdl
+++ b/cells/buf/sky130_fd_sc_ms__buf_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ms__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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X Ab VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X Ab VPB pfet_01v8 m=4 w=1.12 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_ms__buf_4
diff --git a/cells/buf/sky130_fd_sc_ms__buf_4.netlist.tsv b/cells/buf/sky130_fd_sc_ms__buf_4.netlist.tsv
index a3ccf05..3318b7c 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_4.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_ms__buf_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ms__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	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_ms__buf_4.spice b/cells/buf/sky130_fd_sc_ms__buf_4.spice
index 8c226ee..76659a1 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_4.spice
+++ b/cells/buf/sky130_fd_sc_ms__buf_4.spice
@@ -16,26 +16,15 @@
 
 
 .subckt sky130_fd_sc_ms__buf_4 A VGND VNB VPB VPWR X
-M1000 VGND a_86_260# X VNB nlowvt w=740000u l=150000u
-+  ad=1.1063e+12p pd=7.43e+06u as=4.144e+11p ps=4.08e+06u
-M1001 a_86_260# A VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=1.2278e+12p ps=1.077e+07u
-M1002 VPWR A a_86_260# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_86_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_86_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_86_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=6.048e+11p ps=5.56e+06u
-M1006 X a_86_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_86_260# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1008 X a_86_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_86_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_86_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_86_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VGND a_86_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VPWR A a_86_260# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 VPWR a_86_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VGND A a_86_260# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 X a_86_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VGND a_86_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 X a_86_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_86_260# A VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 X a_86_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 X a_86_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_ms__buf_8.cdl b/cells/buf/sky130_fd_sc_ms__buf_8.cdl
index cfc16ff..b071113 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_8.cdl
+++ b/cells/buf/sky130_fd_sc_ms__buf_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ms__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 nlowvt m=3 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8_lvt m=3 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X Ab VNB nfet_01v8_lvt m=8 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8 m=3 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nlowvt m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pshort m=3 w=1.12 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 pshort m=8 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X Ab VPB pfet_01v8 m=8 w=1.12 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_ms__buf_8
diff --git a/cells/buf/sky130_fd_sc_ms__buf_8.netlist.tsv b/cells/buf/sky130_fd_sc_ms__buf_8.netlist.tsv
index 3a057a8..c962f79 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_8.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_ms__buf_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ms__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	nlowvt	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nlowvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	pshort	3	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	pshort	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8_lvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	3	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_ms__buf_8.spice b/cells/buf/sky130_fd_sc_ms__buf_8.spice
index 943a2aa..ef8581f 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_8.spice
+++ b/cells/buf/sky130_fd_sc_ms__buf_8.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ms__buf_8 A VGND VNB VPB VPWR X
-M1000 X a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=8.325e+11p pd=8.17e+06u as=1.591e+12p ps=1.318e+07u
-M1001 VPWR A a_27_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.9768e+12p pd=1.697e+07u as=6.16e+11p ps=5.58e+06u
-M1002 a_27_74# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A a_27_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR a_27_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=1.2824e+12p ps=1.125e+07u
-M1005 X a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_74# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.181e+11p pd=4.09e+06u as=0p ps=0u
-M1007 X a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_27_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_27_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_27_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_27_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_27_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_27_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_27_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_27_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 X a_27_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 X a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VGND A a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR a_27_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 X a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VGND a_27_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR a_27_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 X a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND a_27_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_27_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 X a_27_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 X a_27_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VPWR a_27_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_27_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VPWR a_27_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VGND a_27_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 X a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 VGND a_27_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 X a_27_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.cdl b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.cdl
index 28f8b01..8d146f9 100644
--- a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.cdl
+++ b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 Abb Ab VNB nfet_01v8_lvt m=3 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 Abbb Abb VNB nfet_01v8_lvt m=6 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X Abbb VNB nfet_01v8_lvt m=16 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X Abbb VPB pfet_01v8 m=16 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Abb Ab VNB nlowvt m=3 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Ab A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 Abbb Abb VNB nlowvt m=6 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 Abb Ab VPB pfet_01v8 m=3 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X Abbb VNB nlowvt m=16 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X Abbb VPB pshort m=16 w=1.12 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 pshort m=1 w=1.12 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 pshort m=3 w=1.12 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 pshort m=6 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI5 Abbb Abb VPB pfet_01v8 m=6 w=1.12 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_ms__bufbuf_16
diff --git a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.netlist.tsv b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.netlist.tsv
index e07db42..f9e6df7 100644
--- a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.netlist.tsv
+++ b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Abb	Ab	VGND	VNB	nlowvt	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	Abbb	Abb	VGND	VNB	nlowvt	6	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	Abbb	VGND	VNB	nlowvt	16	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	Abbb	VPWR	VPB	pshort	16	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Abb	Ab	VPWR	VPB	pshort	3	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	Abbb	Abb	VPWR	VPB	pshort	6	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8_lvt	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	Abbb	Abb	VGND	VNB	nfet_01v8_lvt	6	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	Abbb	VGND	VNB	nfet_01v8_lvt	16	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	Abbb	VPWR	VPB	pfet_01v8	16	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8	3	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	Abbb	Abb	VPWR	VPB	pfet_01v8	6	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.spice b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.spice
index c4dfa31..ab4738a 100644
--- a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.spice
+++ b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.spice
@@ -16,108 +16,56 @@
 
 
 .subckt sky130_fd_sc_ms__bufbuf_16 A VGND VNB VPB VPWR X
-M1000 a_588_74# a_203_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=6.216e+11p pd=6.12e+06u as=3.3855e+12p ps=2.987e+07u
-M1001 VGND a_588_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.6576e+12p ps=1.632e+07u
-M1002 X a_588_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.4752e+12p pd=2.234e+07u as=4.3344e+12p ps=3.91e+07u
-M1003 X a_588_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_588_74# a_203_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=9.072e+11p pd=8.34e+06u as=0p ps=0u
-M1005 VGND a_203_74# a_588_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_588_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_203_74# a_588_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_588_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_588_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_588_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1012 a_203_74# a_27_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.16e+11p pd=5.58e+06u as=0p ps=0u
-M1013 a_588_74# a_203_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_588_74# a_203_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_588_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_588_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_588_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_588_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_588_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_27_368# a_203_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_203_74# a_588_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_588_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_203_74# a_27_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_588_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_588_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 X a_588_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_203_74# a_588_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND a_588_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_588_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 X a_588_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_588_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR a_203_74# a_588_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND a_27_368# a_203_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.181e+11p ps=4.09e+06u
-M1034 X a_588_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR a_588_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_588_74# a_203_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_203_74# a_27_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR a_588_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_588_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 X a_588_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 X a_588_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 X a_588_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VPWR a_588_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VGND a_588_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VGND a_588_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_588_74# a_203_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND a_588_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 X a_588_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VGND a_203_74# a_588_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 VGND A a_27_368# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1051 a_203_74# a_27_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_203_74# a_588_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VGND a_588_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 X a_588_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VPWR a_27_368# a_203_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_588_74# a_203_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VGND a_203_74# a_588_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 X a_588_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 X a_588_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VGND a_203_74# a_588_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VGND a_203_74# a_588_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VPWR a_588_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VPWR a_27_368# a_203_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_588_74# a_203_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 X a_588_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 X a_588_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 VPWR a_588_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VPWR a_588_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 X a_588_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_588_74# a_203_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 X a_588_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 X a_588_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 VGND a_588_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 a_588_74# a_203_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_588_74# a_203_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_588_74# a_203_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 X a_588_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 a_27_368# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 X a_588_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 VPWR a_588_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X30 VGND a_588_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 VPWR a_588_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 X a_588_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 X a_588_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 VGND a_588_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X35 VPWR a_588_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X36 a_203_74# a_27_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X37 VPWR a_203_74# a_588_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X38 VPWR a_588_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X39 a_203_74# a_27_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X40 VGND a_588_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X41 VGND a_588_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X42 VGND a_588_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X43 VPWR a_588_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X44 X a_588_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X45 VPWR a_203_74# a_588_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X46 VGND a_27_368# a_203_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X47 X a_588_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X48 VGND a_27_368# a_203_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X49 X a_588_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X50 VGND a_588_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X51 X a_588_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.cdl b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.cdl
index b243652..27d6436 100644
--- a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.cdl
+++ b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__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 nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 Abb Ab VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 Abbb Abb VNB nfet_01v8_lvt m=3 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X Abbb VNB nfet_01v8_lvt m=8 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X Abbb VPB pfet_01v8 m=8 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Abb Ab VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Ab A VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 Abbb Abb VNB nlowvt m=3 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 Abb Ab VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X Abbb VNB nlowvt m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X Abbb VPB pshort m=8 w=1.12 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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 Abb Ab VPB pshort m=1 w=1.12 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 pshort m=3 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI5 Abbb Abb VPB pfet_01v8 m=3 w=1.12 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_ms__bufbuf_8
diff --git a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.netlist.tsv b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.netlist.tsv
index 05f1808..341f1df 100644
--- a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.netlist.tsv
+++ b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__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	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Abb	Ab	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	Abbb	Abb	VGND	VNB	nlowvt	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	Abbb	VGND	VNB	nlowvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	Abbb	VPWR	VPB	pshort	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Abb	Ab	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	Abbb	Abb	VPWR	VPB	pshort	3	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	Abbb	Abb	VGND	VNB	nfet_01v8_lvt	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	Abbb	VGND	VNB	nfet_01v8_lvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	Abbb	VPWR	VPB	pfet_01v8	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	Abbb	Abb	VPWR	VPB	pfet_01v8	3	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.spice b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.spice
index 6f83e85..e1b5fdd 100644
--- a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.spice
+++ b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_ms__bufbuf_8 A VGND VNB VPB VPWR X
-M1000 a_224_368# a_27_112# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=2.2302e+12p ps=1.971e+07u
-M1001 VGND a_334_368# X VNB nlowvt w=740000u l=150000u
-+  ad=1.7549e+12p pd=1.515e+07u as=8.732e+11p ps=8.28e+06u
-M1002 VPWR a_334_368# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=1.2656e+12p ps=1.122e+07u
-M1003 X a_334_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_334_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_334_368# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_334_368# a_224_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.181e+11p pd=4.09e+06u as=0p ps=0u
-M1007 X a_334_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_334_368# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_334_368# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_334_368# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A a_27_112# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1012 X a_334_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_334_368# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_224_368# a_27_112# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1015 VGND a_224_368# a_334_368# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A a_27_112# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1017 X a_334_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_224_368# a_334_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=6.16e+11p ps=5.58e+06u
-M1019 VGND a_224_368# a_334_368# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_334_368# a_224_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_334_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_334_368# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_334_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_224_368# a_334_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_334_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_334_368# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 X a_334_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 X a_334_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 X a_334_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR a_224_368# a_334_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 X a_334_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VPWR a_334_368# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND a_224_368# a_334_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VGND a_334_368# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VGND a_334_368# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND a_334_368# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_334_368# a_224_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 X a_334_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 X a_334_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_334_368# a_224_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 X a_334_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_27_112# A VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X17 VPWR a_334_368# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 a_334_368# a_224_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_27_112# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X20 X a_334_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 VGND a_27_112# a_224_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 VGND a_334_368# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 VPWR a_334_368# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_334_368# a_224_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 VPWR a_27_112# a_224_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/bufinv/sky130_fd_sc_ms__bufinv_16.cdl b/cells/bufinv/sky130_fd_sc_ms__bufinv_16.cdl
index a92b846..c988f11 100644
--- a/cells/bufinv/sky130_fd_sc_ms__bufinv_16.cdl
+++ b/cells/bufinv/sky130_fd_sc_ms__bufinv_16.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__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 nlowvt m=3 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8_lvt m=3 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 Abb Ab VNB nfet_01v8_lvt m=6 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 Y Abb VNB nfet_01v8_lvt m=16 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8 m=3 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Abb Ab VNB nlowvt m=6 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 Abb Ab VPB pfet_01v8 m=6 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 Y Abb VNB nlowvt m=16 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pshort m=3 w=1.12 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 pshort m=6 w=1.12 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 pshort m=16 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 Y Abb VPB pfet_01v8 m=16 w=1.12 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_ms__bufinv_16
diff --git a/cells/bufinv/sky130_fd_sc_ms__bufinv_16.netlist.tsv b/cells/bufinv/sky130_fd_sc_ms__bufinv_16.netlist.tsv
index 148747b..f1ce71d 100644
--- a/cells/bufinv/sky130_fd_sc_ms__bufinv_16.netlist.tsv
+++ b/cells/bufinv/sky130_fd_sc_ms__bufinv_16.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__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	nlowvt	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Abb	Ab	VGND	VNB	nlowvt	6	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	Y	Abb	VGND	VNB	nlowvt	16	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	pshort	3	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Abb	Ab	VPWR	VPB	pshort	6	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	Y	Abb	VPWR	VPB	pshort	16	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8_lvt	6	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	Y	Abb	VGND	VNB	nfet_01v8_lvt	16	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	3	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8	6	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	Y	Abb	VPWR	VPB	pfet_01v8	16	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufinv/sky130_fd_sc_ms__bufinv_16.spice b/cells/bufinv/sky130_fd_sc_ms__bufinv_16.spice
index c9e603c..e62acf9 100644
--- a/cells/bufinv/sky130_fd_sc_ms__bufinv_16.spice
+++ b/cells/bufinv/sky130_fd_sc_ms__bufinv_16.spice
@@ -16,104 +16,54 @@
 
 
 .subckt sky130_fd_sc_ms__bufinv_16 A VGND VNB VPB VPWR Y
-M1000 a_27_74# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.181e+11p pd=4.09e+06u as=3.2079e+12p ps=2.791e+07u
-M1001 VPWR A a_27_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=4.0656e+12p pd=3.638e+07u as=6.16e+11p ps=5.58e+06u
-M1002 a_27_74# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_384_74# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.6576e+12p ps=1.632e+07u
-M1004 Y a_384_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.464e+12p pd=2.232e+07u as=0p ps=0u
-M1005 VPWR A a_27_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_384_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_384_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_384_74# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_384_74# a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=9.296e+11p pd=8.38e+06u as=0p ps=0u
-M1010 VPWR a_384_74# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_384_74# a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=6.216e+11p pd=6.12e+06u as=0p ps=0u
-M1012 Y a_384_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_384_74# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_384_74# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_27_74# a_384_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_27_74# a_384_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_384_74# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_27_74# a_384_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_384_74# a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y a_384_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y a_384_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y a_384_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y a_384_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_384_74# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_27_74# a_384_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_27_74# a_384_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_384_74# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND a_384_74# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_384_74# a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y a_384_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y a_384_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y a_384_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_27_74# a_384_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR a_384_74# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND A a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y a_384_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Y a_384_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND a_384_74# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 Y a_384_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VPWR a_384_74# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VGND a_384_74# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VGND a_384_74# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 Y a_384_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VGND a_384_74# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VPWR a_384_74# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 Y a_384_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND A a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_384_74# a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 a_384_74# a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_27_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 Y a_384_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_384_74# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VGND A a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR a_384_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 Y a_384_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR a_27_74# a_384_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y a_384_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VGND a_27_74# a_384_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 Y a_384_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 Y a_384_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 Y a_384_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 Y a_384_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 Y a_384_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VGND a_384_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 VGND a_384_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 Y a_384_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VGND a_27_74# a_384_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 VGND a_27_74# a_384_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_27_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 VPWR a_27_74# a_384_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 Y a_384_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_384_74# a_27_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 VPWR a_27_74# a_384_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 Y a_384_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 Y a_384_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 Y a_384_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 VGND a_384_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 a_27_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X29 a_384_74# a_27_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X30 VGND a_384_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 Y a_384_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 VPWR a_384_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X33 VPWR a_384_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X34 VGND a_384_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X35 Y a_384_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X36 VPWR a_384_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X37 VPWR a_384_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X38 VGND a_384_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X39 a_384_74# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X40 a_384_74# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X41 VPWR a_384_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X42 VPWR a_384_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X43 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X44 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X45 a_384_74# a_27_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X46 Y a_384_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X47 VGND a_384_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X48 VGND a_384_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X49 VPWR a_384_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/bufinv/sky130_fd_sc_ms__bufinv_8.cdl b/cells/bufinv/sky130_fd_sc_ms__bufinv_8.cdl
index d112737..9e478d9 100644
--- a/cells/bufinv/sky130_fd_sc_ms__bufinv_8.cdl
+++ b/cells/bufinv/sky130_fd_sc_ms__bufinv_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 Abb Ab VNB nfet_01v8_lvt m=3 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 Y Abb VNB nfet_01v8_lvt m=8 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Abb Ab VNB nlowvt m=3 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 Abb Ab VPB pfet_01v8 m=3 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 Y Abb VNB nlowvt m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pshort m=1 w=1.12 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 pshort m=3 w=1.12 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 pshort m=8 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 Y Abb VPB pfet_01v8 m=8 w=1.12 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_ms__bufinv_8
diff --git a/cells/bufinv/sky130_fd_sc_ms__bufinv_8.netlist.tsv b/cells/bufinv/sky130_fd_sc_ms__bufinv_8.netlist.tsv
index 5f57f01..9d2f48e 100644
--- a/cells/bufinv/sky130_fd_sc_ms__bufinv_8.netlist.tsv
+++ b/cells/bufinv/sky130_fd_sc_ms__bufinv_8.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__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	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Abb	Ab	VGND	VNB	nlowvt	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	Y	Abb	VGND	VNB	nlowvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Abb	Ab	VPWR	VPB	pshort	3	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	Y	Abb	VPWR	VPB	pshort	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8_lvt	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	Y	Abb	VGND	VNB	nfet_01v8_lvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8	3	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	Y	Abb	VPWR	VPB	pfet_01v8	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufinv/sky130_fd_sc_ms__bufinv_8.spice b/cells/bufinv/sky130_fd_sc_ms__bufinv_8.spice
index 98a3404..529543d 100644
--- a/cells/bufinv/sky130_fd_sc_ms__bufinv_8.spice
+++ b/cells/bufinv/sky130_fd_sc_ms__bufinv_8.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__bufinv_8 A VGND VNB VPB VPWR Y
-M1000 a_183_48# a_27_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.16e+11p pd=5.58e+06u as=1.9824e+12p ps=1.698e+07u
-M1001 VPWR a_183_48# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=1.3552e+12p ps=1.138e+07u
-M1002 Y a_183_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_183_48# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR a_27_368# a_183_48# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_183_48# a_27_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_183_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=8.954e+11p pd=8.34e+06u as=1.5392e+12p ps=1.304e+07u
-M1007 VPWR A a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1008 Y a_183_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_183_48# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_183_48# a_27_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.292e+11p pd=4.12e+06u as=0p ps=0u
-M1011 VPWR a_183_48# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y a_183_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_183_48# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y a_183_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_183_48# a_27_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_183_48# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y a_183_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_183_48# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_27_368# a_183_48# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y a_183_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y a_183_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_183_48# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A a_27_368# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
+X0 VPWR a_183_48# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR a_27_368# a_183_48# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VGND a_183_48# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR a_183_48# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VGND a_183_48# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_183_48# a_27_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 Y a_183_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 Y a_183_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VPWR a_27_368# a_183_48# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 Y a_183_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 VGND a_183_48# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 Y a_183_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 Y a_183_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_27_368# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 Y a_183_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 VGND a_27_368# a_183_48# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 VGND a_27_368# a_183_48# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 Y a_183_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 Y a_183_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 VPWR a_183_48# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 a_183_48# a_27_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 VGND a_183_48# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 VPWR a_183_48# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.cdl b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.cdl
index 487724f..5aaee71 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.cdl
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ms__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 nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Ab A VNB nfet_01v8_lvt m=1 w=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 nfet_01v8_lvt m=1 w=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 pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X Ab VNB nlowvt m=1 w=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 pshort m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8 m=1 w=1.12 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_ms__clkbuf_1
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.netlist.tsv b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.netlist.tsv
index ca8204a..20691fa 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ms__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	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	Ab	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	Ab	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.spice b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.spice
index 6820afc..8a06f98 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.spice
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_ms__clkbuf_1 A VGND VNB VPB VPWR X
-M1000 X a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=4.144e+11p ps=2.98e+06u
-M1001 VPWR A a_27_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1002 X a_27_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.19e+11p pd=1.41e+06u as=3.276e+11p ps=2.4e+06u
-M1003 VGND A a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
+X0 VGND a_27_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X1 VPWR a_27_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_27_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.cdl b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.cdl
index f3ce60b..87f1f51 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.cdl
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ms__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 nlowvt m=4 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Ab A VNB nfet_01v8_lvt 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 nfet_01v8_lvt 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 pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X Ab VNB nlowvt 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 pshort m=4 w=1.12 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 pshort m=16 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8 m=16 w=1.12 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_ms__clkbuf_16
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.netlist.tsv b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.netlist.tsv
index 8e27a69..2346f33 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ms__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	nlowvt	4	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	Ab	VGND	VNB	nlowvt	16	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Ab	A	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	pshort	16	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	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_lvt	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8	16	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.spice b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.spice
index adae9a2..284bd6e 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.spice
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ms__clkbuf_16 A VGND VNB VPB VPWR X
-M1000 a_114_74# A VGND VNB nlowvt w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=1.4826e+12p ps=1.63e+07u
-M1001 VGND a_114_74# X VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=9.408e+11p ps=1.12e+07u
-M1002 VGND a_114_74# X VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_114_74# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=3.3824e+12p ps=3.068e+07u
-M1004 VPWR A a_114_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_114_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.4192e+12p pd=2.224e+07u as=0p ps=0u
-M1006 a_114_74# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_114_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_114_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_114_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_114_74# X VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_114_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_114_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_114_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_114_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_114_74# X VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_114_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_114_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_114_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_114_74# X VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_114_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_114_74# X VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_114_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_114_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A a_114_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_114_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 X a_114_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 X a_114_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND a_114_74# X VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 X a_114_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_114_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_114_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_114_74# A VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND A a_114_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND a_114_74# X VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 X a_114_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 X a_114_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 X a_114_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR a_114_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_114_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_114_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR a_114_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 X a_114_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 VGND a_114_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 a_114_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 X a_114_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 X a_114_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 X a_114_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 X a_114_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VPWR a_114_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_114_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X11 X a_114_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X12 VPWR a_114_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 X a_114_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VPWR A a_114_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 VPWR a_114_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 X a_114_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VPWR A a_114_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 VPWR a_114_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 VGND a_114_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X20 VGND a_114_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X21 X a_114_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X22 VPWR a_114_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 VPWR a_114_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 VGND a_114_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X25 VGND a_114_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X26 VGND a_114_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 X a_114_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 VPWR a_114_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X29 VGND a_114_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X30 X a_114_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X31 a_114_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X32 X a_114_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X33 X a_114_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X34 VGND A a_114_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X35 X a_114_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X36 X a_114_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X37 VGND A a_114_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X38 VGND a_114_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X39 X a_114_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.cdl b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.cdl
index d6d4725..243d0f8 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.cdl
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ms__clkbuf_2 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Ab A VNB nfet_01v8_lvt m=1 w=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 nfet_01v8_lvt m=2 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 Ab A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X Ab VNB nlowvt m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB pshort m=1 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8 m=2 w=1.12 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_ms__clkbuf_2
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.netlist.tsv b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.netlist.tsv
index dd36d5d..65d5db2 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ms__clkbuf_2	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN0	MOSFET	Ab	A	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	Ab	VGND	VNB	nlowvt	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	Ab	VGND	VNB	nfet_01v8_lvt	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.spice b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.spice
index 38d0b62..48beb68 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.spice
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ms__clkbuf_2 A VGND VNB VPB VPWR X
-M1000 X a_43_192# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=6.048e+11p ps=5.56e+06u
-M1001 VPWR a_43_192# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_43_192# A VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=2.667e+11p ps=2.95e+06u
-M1003 a_43_192# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1004 X a_43_192# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1005 VGND a_43_192# X VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A a_43_192# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X1 VPWR A a_43_192# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 X a_43_192# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 X a_43_192# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR a_43_192# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VGND a_43_192# X VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.cdl b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.cdl
index 3ffa61c..be94e21 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.cdl
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ms__clkbuf_4 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Ab A VNB nfet_01v8_lvt m=1 w=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 nfet_01v8_lvt m=4 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 Ab A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X Ab VNB nlowvt m=4 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB pshort m=1 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8 m=4 w=1.12 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_ms__clkbuf_4
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.netlist.tsv b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.netlist.tsv
index 792bb3f..a3371d2 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ms__clkbuf_4	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN0	MOSFET	Ab	A	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	Ab	VGND	VNB	nlowvt	4	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	Ab	VGND	VNB	nfet_01v8_lvt	4	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.spice b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.spice
index 786dee1..7263381 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.spice
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__clkbuf_4 A VGND VNB VPB VPWR X
-M1000 VGND a_83_270# X VNB nlowvt w=420000u l=150000u
-+  ad=3.969e+11p pd=4.41e+06u as=2.52e+11p ps=2.88e+06u
-M1001 X a_83_270# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=9.744e+11p ps=8.46e+06u
-M1002 VPWR a_83_270# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_83_270# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_83_270# A VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=0p ps=0u
-M1005 a_83_270# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1006 VPWR a_83_270# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_83_270# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_83_270# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_83_270# X VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_83_270# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 X a_83_270# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VGND A a_83_270# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 X a_83_270# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 VPWR A a_83_270# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VPWR a_83_270# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VGND a_83_270# X VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 VPWR a_83_270# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VGND a_83_270# X VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 X a_83_270# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.cdl b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.cdl
index e740aae..f824d9f 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.cdl
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ms__clkbuf_8 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB nlowvt m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Ab A VNB nfet_01v8_lvt m=2 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X Ab VNB nfet_01v8_lvt m=8 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 Ab A VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X Ab VNB nlowvt m=8 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB pshort m=2 w=1.12 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 pshort m=8 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8 m=8 w=1.12 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_ms__clkbuf_8
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.netlist.tsv b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.netlist.tsv
index c68ca45..0fa9d6c 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ms__clkbuf_8	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN0	MOSFET	Ab	A	VGND	VNB	nlowvt	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	Ab	VGND	VNB	nlowvt	8	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Ab	A	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	pshort	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	Ab	VGND	VNB	nfet_01v8_lvt	8	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.spice b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.spice
index aa06f15..8d466b2 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.spice
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__clkbuf_8 A VGND VNB VPB VPWR X
-M1000 VGND a_128_74# X VNB nlowvt w=420000u l=150000u
-+  ad=8.757e+11p pd=9.21e+06u as=4.809e+11p ps=5.65e+06u
-M1001 VGND a_128_74# X VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 X a_128_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2264e+12p pd=1.115e+07u as=2.0552e+12p ps=1.711e+07u
-M1003 VPWR a_128_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A a_128_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.08e+11p ps=2.79e+06u
-M1005 X a_128_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_128_74# X VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_128_74# X VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_128_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_128_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_128_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_128_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A a_128_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1013 X a_128_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_128_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_128_74# A VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_128_74# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_128_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_128_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_128_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_128_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X1 X a_128_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 VGND a_128_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 X a_128_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 X a_128_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 X a_128_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VPWR A a_128_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 X a_128_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VGND A a_128_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 X a_128_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 VGND a_128_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X11 VPWR a_128_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 VGND a_128_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X13 VPWR a_128_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_128_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X15 VGND a_128_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X16 VPWR a_128_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 X a_128_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X18 a_128_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 VPWR a_128_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.cdl b/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.cdl
index 5e343eb..91349f1 100644
--- a/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.cdl
+++ b/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__clkdlyinv3sd1_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Abb Ab VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Abb Ab VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 Y Abb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 Ab A VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Y Abb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Abb Ab VPB pfet_01v8 m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Ab A VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP1 Abb Ab VPB pshort m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 Y Abb VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 Y Abb VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI8 Ab A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Ab A VPB pshort m=1 w=1.12 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_ms__clkdlyinv3sd1_1
diff --git a/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.netlist.tsv b/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.netlist.tsv
index 7044c85..cca11cb 100644
--- a/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.netlist.tsv
+++ b/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__clkdlyinv3sd1_1	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Abb	Ab	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Y	Abb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Ab	A	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Abb	Ab	VPWR	VPB	pshort	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Y	Abb	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Y	Abb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Y	Abb	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.spice b/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.spice
index 9d2ac0c..2eb3b1f 100644
--- a/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.spice
+++ b/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ms__clkdlyinv3sd1_1 A VGND VNB VPB VPWR Y
-M1000 Y a_288_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.968e+11p pd=2.77e+06u as=1.0312e+12p ps=6.42e+06u
-M1001 a_288_74# a_28_74# VPWR VPB pshort w=1e+06u l=150000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
-M1002 VPWR A a_28_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.968e+11p ps=2.77e+06u
-M1003 VGND A a_28_74# VNB nlowvt w=420000u l=150000u
-+  ad=4.2e+11p pd=3.68e+06u as=1.113e+11p ps=1.37e+06u
-M1004 a_288_74# a_28_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 Y a_288_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 VPWR a_288_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR a_28_74# a_288_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=150000u
+X2 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 VGND a_288_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 VGND a_28_74# a_288_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.cdl b/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.cdl
index 723f212..0411076 100644
--- a/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.cdl
+++ b/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__clkdlyinv3sd2_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Abb Ab VNB nlowvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN1 Abb Ab VNB nfet_01v8_lvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 Y Abb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 Ab A VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Y Abb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Abb Ab VPB pfet_01v8 m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Ab A VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP1 Abb Ab VPB pshort m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP2 Y Abb VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 Y Abb VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI8 Ab A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Ab A VPB pshort m=1 w=1.12 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_ms__clkdlyinv3sd2_1
diff --git a/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.netlist.tsv b/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.netlist.tsv
index 1b07971..697ff37 100644
--- a/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.netlist.tsv
+++ b/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__clkdlyinv3sd2_1	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Abb	Ab	VGND	VNB	nlowvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Y	Abb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Ab	A	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Abb	Ab	VPWR	VPB	pshort	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Y	Abb	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8_lvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Y	Abb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Y	Abb	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.spice b/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.spice
index 56f048c..5c02798 100644
--- a/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.spice
+++ b/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ms__clkdlyinv3sd2_1 A VGND VNB VPB VPWR Y
-M1000 Y a_288_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.968e+11p pd=2.77e+06u as=9.312e+11p ps=6.22e+06u
-M1001 a_288_74# a_28_74# VGND VNB nlowvt w=420000u l=180000u
-+  ad=1.113e+11p pd=1.37e+06u as=4.074e+11p ps=3.62e+06u
-M1002 VPWR A a_28_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.968e+11p ps=2.77e+06u
-M1003 VGND A a_28_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 a_288_74# a_28_74# VPWR VPB pshort w=1e+06u l=250000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
-M1005 Y a_288_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 VPWR a_288_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 VGND a_288_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 VGND a_28_74# a_288_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=180000u
+X4 VPWR a_28_74# a_288_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=250000u
+X5 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.cdl b/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.cdl
index e759f56..fa3b24f 100644
--- a/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.cdl
+++ b/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__clkdlyinv3sd3_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Abb Ab VNB nlowvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN1 Abb Ab VNB nfet_01v8_lvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 Y Abb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 Ab A VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Y Abb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Abb Ab VPB pfet_01v8 m=1 w=1 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Ab A VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP1 Abb Ab VPB pshort m=1 w=1 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP2 Y Abb VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 Y Abb VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Ab A VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MI8 Ab A VPB pfet_01v8 m=1 w=1.12 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_ms__clkdlyinv3sd3_1
diff --git a/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.netlist.tsv b/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.netlist.tsv
index fecc61b..dceca44 100644
--- a/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.netlist.tsv
+++ b/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__clkdlyinv3sd3_1	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Abb	Ab	VGND	VNB	nlowvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Y	Abb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Ab	A	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Abb	Ab	VPWR	VPB	pshort	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Y	Abb	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8_lvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Y	Abb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Y	Abb	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.spice b/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.spice
index 6d32c0e..b44d1af 100644
--- a/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.spice
+++ b/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ms__clkdlyinv3sd3_1 A VGND VNB VPB VPWR Y
-M1000 a_288_74# a_28_74# VPWR VPB pshort w=1e+06u l=500000u
-+  ad=2.6e+11p pd=2.52e+06u as=6.812e+11p ps=5.72e+06u
-M1001 Y a_288_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.968e+11p pd=2.77e+06u as=0p ps=0u
-M1002 a_288_74# a_28_74# VGND VNB nlowvt w=420000u l=180000u
-+  ad=1.113e+11p pd=1.37e+06u as=4.074e+11p ps=3.62e+06u
-M1003 VPWR A a_28_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.968e+11p ps=2.77e+06u
-M1004 VGND A a_28_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 Y a_288_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 VPWR a_28_74# a_288_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=500000u
+X1 VPWR a_288_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 VGND a_288_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 VGND a_28_74# a_288_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=180000u
+X5 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.cdl b/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.cdl
index b115127..18ced08 100644
--- a/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.cdl
+++ b/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__clkdlyinv5sd1_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Abb Ab VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Abb Ab VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 Y Abbbb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 Ab A VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Y Abbbb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 Abbbb Abbb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI13 Abbb Abb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Abb Ab VPB pfet_01v8 m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Ab A VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI16 Abbbb Abbb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 Y Abbbb VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Abbb Abb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 Ab A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Abb Ab VPB pshort m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 Abbbb Abbb VPB pfet_01v8 m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 Y Abbbb VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Ab A VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI17 Abbbb Abbb VPB pshort m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 Abbb Abb VPB pshort m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
+MI14 Abbb Abb VPB pfet_01v8 m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__clkdlyinv5sd1_1
diff --git a/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.netlist.tsv b/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.netlist.tsv
index e62865c..c598586 100644
--- a/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.netlist.tsv
+++ b/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__clkdlyinv5sd1_1	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Abb	Ab	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Y	Abbbb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Ab	A	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Abbbb	Abbb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Abbb	Abb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Abb	Ab	VPWR	VPB	pshort	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Y	Abbbb	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Abbbb	Abbb	VPWR	VPB	pshort	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	Abbb	Abb	VPWR	VPB	pshort	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Y	Abbbb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Abbbb	Abbb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Abbb	Abb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Y	Abbbb	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Abbbb	Abbb	VPWR	VPB	pfet_01v8	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	Abbb	Abb	VPWR	VPB	pfet_01v8	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.spice b/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.spice
index e230033..b6324e1 100644
--- a/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.spice
+++ b/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__clkdlyinv5sd1_1 A VGND VNB VPB VPWR Y
-M1000 a_549_74# a_288_74# VPWR VPB pshort w=1e+06u l=150000u
-+  ad=2.65e+11p pd=2.53e+06u as=1.8512e+12p ps=1.006e+07u
-M1001 a_549_74# a_288_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=7.623e+11p ps=6.15e+06u
-M1002 Y a_682_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 VPWR a_549_74# a_682_74# VPB pshort w=1e+06u l=150000u
-+  ad=0p pd=0u as=6.1e+11p ps=3.22e+06u
-M1004 VGND a_549_74# a_682_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.583e+11p ps=2.07e+06u
-M1005 a_288_74# a_28_74# VPWR VPB pshort w=1e+06u l=150000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
-M1006 VPWR A a_28_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.968e+11p ps=2.77e+06u
-M1007 VGND A a_28_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 Y a_682_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.968e+11p pd=2.77e+06u as=0p ps=0u
-M1009 a_288_74# a_28_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_682_74# a_549_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=150000u
+X1 VPWR a_288_74# a_549_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=150000u
+X2 VPWR a_28_74# a_288_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=150000u
+X3 VGND a_682_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 a_682_74# a_549_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X6 VGND a_28_74# a_288_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 VGND a_288_74# a_549_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X8 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VPWR a_682_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.cdl b/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.cdl
index 8684e4d..6dbdb53 100644
--- a/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.cdl
+++ b/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__clkdlyinv5sd2_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Abb Ab VNB nlowvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN1 Abb Ab VNB nfet_01v8_lvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 Y Abbbb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 Ab A VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Y Abbbb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 Abbbb Abbb VNB nfet_01v8_lvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI13 Abbb Abb VNB nfet_01v8_lvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Abb Ab VPB pfet_01v8 m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Ab A VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI16 Abbbb Abbb VNB nlowvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 Y Abbbb VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Abbb Abb VNB nlowvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI8 Ab A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Abb Ab VPB pshort m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI17 Abbbb Abbb VPB pfet_01v8 m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 Y Abbbb VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Ab A VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI17 Abbbb Abbb VPB pshort m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 Abbb Abb VPB pshort m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI14 Abbb Abb VPB pfet_01v8 m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__clkdlyinv5sd2_1
diff --git a/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.netlist.tsv b/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.netlist.tsv
index 0717d51..f9ab648 100644
--- a/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.netlist.tsv
+++ b/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__clkdlyinv5sd2_1	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Abb	Ab	VGND	VNB	nlowvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Y	Abbbb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Ab	A	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Abbbb	Abbb	VGND	VNB	nlowvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Abbb	Abb	VGND	VNB	nlowvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Abb	Ab	VPWR	VPB	pshort	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Y	Abbbb	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Abbbb	Abbb	VPWR	VPB	pshort	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	Abbb	Abb	VPWR	VPB	pshort	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8_lvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Y	Abbbb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Abbbb	Abbb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Abbb	Abb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Y	Abbbb	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Abbbb	Abbb	VPWR	VPB	pfet_01v8	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	Abbb	Abb	VPWR	VPB	pfet_01v8	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.spice b/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.spice
index 6cee160..e737f38 100644
--- a/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.spice
+++ b/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__clkdlyinv5sd2_1 A VGND VNB VPB VPWR Y
-M1000 a_549_74# a_288_74# VGND VNB nlowvt w=420000u l=180000u
-+  ad=1.113e+11p pd=1.37e+06u as=7.371e+11p ps=6.03e+06u
-M1001 VGND a_549_74# a_682_74# VNB nlowvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.457e+11p ps=2.01e+06u
-M1002 Y a_682_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 a_549_74# a_288_74# VPWR VPB pshort w=1e+06u l=250000u
-+  ad=2.65e+11p pd=2.53e+06u as=1.6512e+12p ps=9.66e+06u
-M1004 VPWR a_549_74# a_682_74# VPB pshort w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.1e+11p ps=3.02e+06u
-M1005 a_288_74# a_28_74# VGND VNB nlowvt w=420000u l=180000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 VPWR A a_28_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.968e+11p ps=2.77e+06u
-M1007 VGND A a_28_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 Y a_682_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.968e+11p pd=2.77e+06u as=0p ps=0u
-M1009 a_288_74# a_28_74# VPWR VPB pshort w=1e+06u l=250000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
+X0 a_682_74# a_549_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=250000u
+X1 VGND a_682_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 VPWR a_288_74# a_549_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=250000u
+X4 VGND a_28_74# a_288_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=180000u
+X5 VGND a_288_74# a_549_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=180000u
+X6 a_682_74# a_549_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=180000u
+X7 VPWR a_28_74# a_288_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=250000u
+X8 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VPWR a_682_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.cdl b/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.cdl
index 886ddb0..b8cd06e 100644
--- a/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.cdl
+++ b/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__clkdlyinv5sd3_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Abb Ab VNB nlowvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN1 Abb Ab VNB nfet_01v8_lvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 Y Abbbb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 Ab A VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Y Abbbb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 Abbbb Abbb VNB nfet_01v8_lvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI13 Abbb Abb VNB nfet_01v8_lvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Abb Ab VPB pfet_01v8 m=1 w=1 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Ab A VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI16 Abbbb Abbb VNB nlowvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 Y Abbbb VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Abbb Abb VNB nlowvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI8 Ab A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Abb Ab VPB pshort m=1 w=1 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP2 Y Abbbb VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 Abbbb Abbb VPB pfet_01v8 m=1 w=1 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Ab A VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI17 Abbbb Abbb VPB pshort m=1 w=1 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 Abbb Abb VPB pshort m=1 w=1 l=0.5 mult=1 sa=0.265 sb=0.265
+MI14 Abbb Abb VPB pfet_01v8 m=1 w=1 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__clkdlyinv5sd3_1
diff --git a/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.netlist.tsv b/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.netlist.tsv
index cd68b6d..a1ef464 100644
--- a/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.netlist.tsv
+++ b/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__clkdlyinv5sd3_1	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Abb	Ab	VGND	VNB	nlowvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Y	Abbbb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Ab	A	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Abbbb	Abbb	VGND	VNB	nlowvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Abbb	Abb	VGND	VNB	nlowvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Abb	Ab	VPWR	VPB	pshort	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Y	Abbbb	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Abbbb	Abbb	VPWR	VPB	pshort	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	Abbb	Abb	VPWR	VPB	pshort	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8_lvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Y	Abbbb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Abbbb	Abbb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Abbb	Abb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Y	Abbbb	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Abbbb	Abbb	VPWR	VPB	pfet_01v8	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	Abbb	Abb	VPWR	VPB	pfet_01v8	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.spice b/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.spice
index 8d30270..4ee3b4f 100644
--- a/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.spice
+++ b/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__clkdlyinv5sd3_1 A VGND VNB VPB VPWR Y
-M1000 VPWR a_549_74# a_682_74# VPB pshort w=1e+06u l=500000u
-+  ad=1.1512e+12p pd=8.66e+06u as=2.6e+11p ps=2.52e+06u
-M1001 a_549_74# a_288_74# VGND VNB nlowvt w=420000u l=180000u
-+  ad=1.113e+11p pd=1.37e+06u as=7.371e+11p ps=6.03e+06u
-M1002 VGND a_549_74# a_682_74# VNB nlowvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.457e+11p ps=2.01e+06u
-M1003 Y a_682_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1004 a_288_74# a_28_74# VPWR VPB pshort w=1e+06u l=500000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
-M1005 a_288_74# a_28_74# VGND VNB nlowvt w=420000u l=180000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 VPWR A a_28_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.968e+11p ps=2.77e+06u
-M1007 a_549_74# a_288_74# VPWR VPB pshort w=1e+06u l=500000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1008 VGND A a_28_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 Y a_682_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.968e+11p pd=2.77e+06u as=0p ps=0u
+X0 VPWR a_288_74# a_549_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=500000u
+X1 VPWR a_28_74# a_288_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=500000u
+X2 VGND a_682_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 VGND a_28_74# a_288_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=180000u
+X5 VGND a_288_74# a_549_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=180000u
+X6 a_682_74# a_549_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=180000u
+X7 a_682_74# a_549_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=500000u
+X8 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VPWR a_682_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_1.cdl b/cells/clkinv/sky130_fd_sc_ms__clkinv_1.cdl
index 2e63e02..ed5b3fc 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_1.cdl
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_1.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ms__clkinv_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN0 Y A VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Y A VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Y A VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__clkinv_1
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_1.netlist.tsv b/cells/clkinv/sky130_fd_sc_ms__clkinv_1.netlist.tsv
index 4b442f2..39a47c5 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_1.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_1.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ms__clkinv_1	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN0	MOSFET	Y	A	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Y	A	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_1.spice b/cells/clkinv/sky130_fd_sc_ms__clkinv_1.spice
index a2c2a0e..c29adf2 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_1.spice
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_1.spice
@@ -16,10 +16,7 @@
 
 
 .subckt sky130_fd_sc_ms__clkinv_1 A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nlowvt w=420000u l=150000u
-+  ad=2.2535e+11p pd=2.17e+06u as=1.491e+11p ps=1.55e+06u
-M1001 Y A VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=4.536e+11p ps=4.44e+06u
-M1002 VPWR A Y VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_16.cdl b/cells/clkinv/sky130_fd_sc_ms__clkinv_16.cdl
index 95285fc..1f5001f 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_16.cdl
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_16.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ms__clkinv_16 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP0 Y A VPB pshort m=24 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8 m=24 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 Y A VNB nlowvt 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
+MMIN0 Y A VNB nfet_01v8_lvt 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
 .ENDS sky130_fd_sc_ms__clkinv_16
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_16.netlist.tsv b/cells/clkinv/sky130_fd_sc_ms__clkinv_16.netlist.tsv
index 5d30e19..ca789bf 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_16.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_16.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ms__clkinv_16	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP0	MOSFET	Y	A	VPWR	VPB	pshort	24	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	Y	A	VGND	VNB	nlowvt	16	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	24	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	16	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_16.spice b/cells/clkinv/sky130_fd_sc_ms__clkinv_16.spice
index 3ee3847..36b3746 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_16.spice
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_16.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ms__clkinv_16 A VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.696e+12p pd=3.348e+07u as=4.0656e+12p ps=3.638e+07u
-M1001 Y A VGND VNB nlowvt w=420000u l=150000u
-+  ad=9.408e+11p pd=1.12e+07u as=1.83765e+12p ps=1.762e+07u
-M1002 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A Y VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A Y VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A Y VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A Y VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND A Y VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y A VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND A Y VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND A Y VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND A Y VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X8 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X12 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X17 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X20 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X23 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X24 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X28 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X29 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X30 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X31 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X33 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X34 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X35 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X36 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X37 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X38 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X39 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_2.cdl b/cells/clkinv/sky130_fd_sc_ms__clkinv_2.cdl
index 6b0b526..5cf53f2 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_2.cdl
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_2.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ms__clkinv_2 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP0 Y A VPB pshort m=3 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8 m=3 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 Y A VNB nlowvt m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Y A VNB nfet_01v8_lvt m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__clkinv_2
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_2.netlist.tsv b/cells/clkinv/sky130_fd_sc_ms__clkinv_2.netlist.tsv
index 9328dd5..18540bd 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_2.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_2.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ms__clkinv_2	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP0	MOSFET	Y	A	VPWR	VPB	pshort	3	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	Y	A	VGND	VNB	nlowvt	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	3	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_2.spice b/cells/clkinv/sky130_fd_sc_ms__clkinv_2.spice
index 82c3f5f..be7ea0f 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_2.spice
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_2.spice
@@ -16,14 +16,9 @@
 
 
 .subckt sky130_fd_sc_ms__clkinv_2 A VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=6.16e+11p pd=5.58e+06u as=6.16e+11p ps=5.58e+06u
-M1001 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND A Y VNB nlowvt w=420000u l=150000u
-+  ad=2.394e+11p pd=2.82e+06u as=3.276e+11p ps=2.4e+06u
-M1003 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_4.cdl b/cells/clkinv/sky130_fd_sc_ms__clkinv_4.cdl
index fb0a933..52acf9f 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_4.cdl
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ms__clkinv_4 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP0 Y A VPB pshort m=6 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8 m=6 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 Y A VNB nlowvt m=4 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Y A VNB nfet_01v8_lvt m=4 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__clkinv_4
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_4.netlist.tsv b/cells/clkinv/sky130_fd_sc_ms__clkinv_4.netlist.tsv
index f5ec8f0..c2c9a1e 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_4.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_4.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ms__clkinv_4	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP0	MOSFET	Y	A	VPWR	VPB	pshort	6	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	Y	A	VGND	VNB	nlowvt	4	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	6	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	4	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_4.spice b/cells/clkinv/sky130_fd_sc_ms__clkinv_4.spice
index 5c59319..0a29c3e 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_4.spice
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_4.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__clkinv_4 A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nlowvt w=420000u l=150000u
-+  ad=4.242e+11p pd=3.7e+06u as=6.216e+11p ps=5.48e+06u
-M1001 Y A VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=9.072e+11p pd=8.34e+06u as=1.344e+12p ps=1.136e+07u
-M1003 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A Y VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A Y VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X8 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_8.cdl b/cells/clkinv/sky130_fd_sc_ms__clkinv_8.cdl
index 50c1abd..cacb696 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_8.cdl
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ms__clkinv_8 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP0 Y A VPB pshort m=12 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8 m=12 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 Y A VNB nlowvt m=8 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Y A VNB nfet_01v8_lvt m=8 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__clkinv_8
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_8.netlist.tsv b/cells/clkinv/sky130_fd_sc_ms__clkinv_8.netlist.tsv
index 8907f1d..61479ef 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_8.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_8.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ms__clkinv_8	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP0	MOSFET	Y	A	VPWR	VPB	pshort	12	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	Y	A	VGND	VNB	nlowvt	8	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	12	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	8	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_8.spice b/cells/clkinv/sky130_fd_sc_ms__clkinv_8.spice
index 5c642b4..1d691a2 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_8.spice
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_8.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__clkinv_8 A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.2264e+12p pd=9.2e+06u as=7.77e+11p ps=7.9e+06u
-M1001 VGND A Y VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.8144e+12p pd=1.668e+07u as=2.4472e+12p ps=2.005e+07u
-M1003 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A Y VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A Y VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A Y VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X8 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X12 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X14 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X18 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X19 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/conb/sky130_fd_sc_ms__conb_1.spice b/cells/conb/sky130_fd_sc_ms__conb_1.spice
index b2929a7..b4330cb 100644
--- a/cells/conb/sky130_fd_sc_ms__conb_1.spice
+++ b/cells/conb/sky130_fd_sc_ms__conb_1.spice
@@ -16,6 +16,6 @@
 
 
 .subckt sky130_fd_sc_ms__conb_1 VGND VNB VPB VPWR HI LO
-R0 HI VPWR short w=510000u l=45000u
-R1 VGND LO short w=510000u l=45000u
+X0 HI VPWR VNB short w=510000u l=45000u
+X1 VGND LO VNB short w=510000u l=45000u
 .ends
diff --git a/cells/decap/sky130_fd_sc_ms__decap_4.spice b/cells/decap/sky130_fd_sc_ms__decap_4.spice
index 5a86d72..d2b0895 100644
--- a/cells/decap/sky130_fd_sc_ms__decap_4.spice
+++ b/cells/decap/sky130_fd_sc_ms__decap_4.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_ms__decap_4 VGND VNB VPB VPWR
-M1000 VPWR VGND VPWR VPB pshort w=1e+06u l=1e+06u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1001 VGND VPWR VGND VNB nlowvt w=420000u l=1e+06u
-+  ad=2.31e+11p pd=2.78e+06u as=0p ps=0u
+X0 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=1e+06u
+X1 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=1e+06u
 .ends
diff --git a/cells/decap/sky130_fd_sc_ms__decap_8.spice b/cells/decap/sky130_fd_sc_ms__decap_8.spice
index a24f778..95074e0 100644
--- a/cells/decap/sky130_fd_sc_ms__decap_8.spice
+++ b/cells/decap/sky130_fd_sc_ms__decap_8.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_ms__decap_8 VGND VNB VPB VPWR
-M1000 VPWR VGND VPWR VPB pshort w=1e+06u l=1e+06u
-+  ad=8.35e+11p pd=7.67e+06u as=0p ps=0u
-M1001 VGND VPWR VGND VNB nlowvt w=420000u l=1e+06u
-+  ad=3.465e+11p pd=4.17e+06u as=0p ps=0u
-M1002 VPWR VGND VPWR VPB pshort w=1e+06u l=1e+06u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND VPWR VGND VNB nlowvt w=420000u l=1e+06u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=1e+06u
+X1 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=1e+06u
+X2 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=1e+06u
+X3 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=1e+06u
 .ends
diff --git a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.cdl b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.cdl
index 94f0faa..2973820 100644
--- a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.cdl
+++ b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_ms__dfbbn_1 CLK_N D RESET_B SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK_N:I D:I RESET_B:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI46 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI46 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 RESET RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI659 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI676 M1 M0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net89 SET_B VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI642 RESET RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI676 M1 M0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net230 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI677 M1 RESET VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI675 net89 SET_B VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 net114 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net122 net150 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 Q net230 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N net150 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net230 net150 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI677 M1 RESET VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI668 S0 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI667 net142 M1 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI630 net150 RESET VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI648 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI3 net150 S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net149 SET_B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI679 M1 SET_B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net230 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net150 S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI670 net174 M1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI678 net225 RESET VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI44 clkpos CLK_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net182 net150 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI649 net114 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net150 SET_B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 net169 RESET VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 net198 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 RESET RESET_B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI655 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI654 net122 net150 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 Q_N net150 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK_N VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI652 net230 net150 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI680 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI668 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI667 net142 M1 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI630 net150 RESET VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI3 net150 S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net149 SET_B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI679 M1 SET_B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net230 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net150 S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net230 net150 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI670 net174 M1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N net150 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI678 net225 RESET VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net182 net150 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net150 SET_B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 net169 RESET VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 net198 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 RESET RESET_B VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK_N VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI680 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net230 net150 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N net150 VPB pfet_01v8 m=1 w=1.12 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_ms__dfbbn_1
diff --git a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.netlist.tsv b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.netlist.tsv
index 04a7e43..566b713 100644
--- a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.netlist.tsv
+++ b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ms__dfbbn_1	CLK_N:I D:I RESET_B:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	db	D	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	RESET	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI676	MOSFET	M1	M0	net89	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net89	SET_B	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net230	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	M1	RESET	net89	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M0	clkpos	net114	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	net114	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	S0	clkneg	net122	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net122	net150	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	net150	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net230	net150	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI668	MOSFET	S0	clkpos	net142	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net142	M1	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI630	MOSFET	net150	RESET	net149	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net150	S0	net149	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net149	SET_B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	M1	SET_B	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkneg	net174	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net230	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net150	S0	net169	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net174	M1	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net225	RESET	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net182	net150	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net182	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net150	SET_B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net169	RESET	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	net198	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M0	clkneg	net198	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	RESET	RESET_B	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	M1	M0	net225	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net230	net150	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net150	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	RESET	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI676	MOSFET	M1	M0	net89	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	net89	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net230	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	M1	RESET	net89	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M0	clkpos	net114	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	net114	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	S0	clkneg	net122	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net122	net150	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	net150	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net230	net150	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI668	MOSFET	S0	clkpos	net142	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net142	M1	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI630	MOSFET	net150	RESET	net149	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net150	S0	net149	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net149	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkneg	net174	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net230	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net150	S0	net169	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net174	M1	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI678	MOSFET	net225	RESET	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net182	net150	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	S0	clkpos	net182	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net150	SET_B	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net169	RESET	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	net198	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M0	clkneg	net198	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	RESET	RESET_B	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	M1	M0	net225	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net230	net150	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net150	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.spice b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.spice
index 09a8c8a..506fc52 100644
--- a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.spice
+++ b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ms__dfbbn_1 CLK_N D RESET_B SET_B VGND VNB VPB VPWR Q Q_N
-M1000 VGND a_1534_446# a_1611_140# VNB nlowvt w=420000u l=150000u
-+  ad=1.55002e+12p pd=1.351e+07u as=1.008e+11p ps=1.32e+06u
-M1001 a_595_119# a_27_74# a_523_119# VNB nlowvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1002 VGND a_1534_446# a_2412_410# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1003 VPWR a_978_357# a_936_424# VPB pshort w=840000u l=180000u
-+  ad=2.39652e+12p pd=2.021e+07u as=1.764e+11p ps=2.1e+06u
-M1004 Q_N a_1534_446# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.968e+11p pd=2.77e+06u as=0p ps=0u
-M1005 a_311_119# a_200_74# a_595_119# VNB nlowvt w=420000u l=150000u
-+  ad=5.1975e+11p pd=3.99e+06u as=0p ps=0u
-M1006 a_540_503# a_474_405# VPWR VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1007 a_1300_424# a_474_405# VPWR VPB pshort w=840000u l=180000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1008 VGND RESET_B a_978_357# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1009 Q a_2412_410# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.998e+11p pd=2.02e+06u as=0p ps=0u
-M1010 a_523_119# a_474_405# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR RESET_B a_978_357# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1012 a_311_119# a_27_74# a_595_119# VPB pshort w=420000u l=180000u
-+  ad=3.3585e+11p pd=3.41e+06u as=1.386e+11p ps=1.5e+06u
-M1013 a_474_405# SET_B VPWR VPB pshort w=840000u l=180000u
-+  ad=4.452e+11p pd=4.42e+06u as=0p ps=0u
-M1014 VGND D a_311_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_595_119# a_200_74# a_540_503# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1818_76# SET_B VGND VNB nlowvt w=740000u l=150000u
-+  ad=5.032e+11p pd=4.56e+06u as=0p ps=0u
-M1017 VPWR D a_311_119# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1486_508# a_27_74# a_1349_114# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.688e+11p ps=2.4e+06u
-M1019 a_1920_392# a_978_357# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1020 a_474_405# a_595_119# a_867_119# VNB nlowvt w=550000u l=150000u
-+  ad=1.925e+11p pd=1.8e+06u as=3.4925e+11p ps=3.47e+06u
-M1021 a_936_424# a_595_119# a_474_405# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1611_140# a_200_74# a_1349_114# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=6.2825e+11p ps=3.42e+06u
-M1023 VPWR a_1534_446# a_1486_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1254_119# a_474_405# VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.83125e+11p pd=1.8e+06u as=0p ps=0u
-M1025 VPWR SET_B a_1534_446# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.45e+11p ps=5.09e+06u
-M1026 a_1534_446# a_1349_114# a_1920_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND SET_B a_867_119# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1349_114# a_27_74# a_1254_119# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Q_N a_1534_446# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.998e+11p pd=2.02e+06u as=0p ps=0u
-M1030 VPWR CLK_N a_27_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.024e+11p ps=2.78e+06u
-M1031 a_200_74# a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.968e+11p pd=2.77e+06u as=0p ps=0u
-M1032 a_867_119# a_978_357# a_474_405# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1818_76# a_1349_114# a_1534_446# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.368e+11p ps=2.12e+06u
-M1034 a_1534_446# a_978_357# a_1818_76# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND CLK_N a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1036 a_200_74# a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1037 Q a_2412_410# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1038 a_1349_114# a_200_74# a_1300_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_1534_446# a_2412_410# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.268e+11p ps=2.22e+06u
+X0 VPWR a_474_405# a_1300_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 a_595_119# a_200_74# a_311_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 a_1534_446# a_1349_114# a_1818_76# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND a_1534_446# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR a_1534_446# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_1611_140# a_1534_446# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X6 VPWR a_978_357# a_1920_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VGND a_27_74# a_200_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_1300_424# a_200_74# a_1349_114# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 a_1920_392# a_1349_114# a_1534_446# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_2412_410# a_1534_446# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X11 a_540_503# a_200_74# a_595_119# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X12 a_1534_446# SET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 a_311_119# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X14 a_474_405# a_978_357# a_867_119# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X15 a_474_405# a_595_119# a_936_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X16 VPWR a_27_74# a_200_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_867_119# a_595_119# a_474_405# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X18 a_1254_119# a_27_74# a_1349_114# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X19 VGND SET_B a_1818_76# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_311_119# D VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X21 a_1349_114# a_27_74# a_1486_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X22 a_978_357# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X23 VPWR a_474_405# a_540_503# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X24 a_595_119# a_27_74# a_311_119# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X25 a_867_119# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X26 a_936_424# a_978_357# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X27 VGND a_2412_410# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 a_1486_508# a_1534_446# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X29 VGND a_474_405# a_523_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X30 a_523_119# a_27_74# a_595_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X31 a_1349_114# a_200_74# a_1611_140# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X32 VPWR SET_B a_474_405# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X33 a_1818_76# a_978_357# a_1534_446# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 a_2412_410# a_1534_446# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X35 a_978_357# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X36 a_27_74# CLK_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X37 a_27_74# CLK_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X38 VGND a_474_405# a_1254_119# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X39 VPWR a_2412_410# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.cdl b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.cdl
index fdc4ff6..1c2572c 100644
--- a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.cdl
+++ b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_ms__dfbbn_2 CLK_N D RESET_B SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK_N:I D:I RESET_B:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI46 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI46 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 RESET RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI659 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI676 M1 M0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net89 SET_B VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI642 RESET RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI676 M1 M0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net230 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI677 M1 RESET VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI675 net89 SET_B VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 net105 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net122 net150 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 Q net230 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N net150 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net230 net150 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI677 M1 RESET VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI668 S0 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI667 net137 M1 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI630 net150 RESET VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI648 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI3 net150 S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net149 SET_B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI679 M1 SET_B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net230 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net150 S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI670 net174 M1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI678 net225 RESET VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI44 clkpos CLK_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net182 net150 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI649 net105 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net150 SET_B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 net169 RESET VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 net198 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 RESET RESET_B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI655 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI654 net122 net150 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 Q_N net150 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK_N VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI652 net230 net150 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI680 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI668 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI667 net137 M1 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI630 net150 RESET VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI3 net150 S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net149 SET_B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI679 M1 SET_B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net230 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net150 S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net230 net150 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI670 net174 M1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N net150 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI678 net225 RESET VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net182 net150 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net150 SET_B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 net169 RESET VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 net198 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 RESET RESET_B VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK_N VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI680 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net230 net150 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N net150 VPB pfet_01v8 m=2 w=1.12 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_ms__dfbbn_2
diff --git a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.netlist.tsv b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.netlist.tsv
index ec07dbd..36358df 100644
--- a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.netlist.tsv
+++ b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ms__dfbbn_2	CLK_N:I D:I RESET_B:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	db	D	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	RESET	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI676	MOSFET	M1	M0	net89	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net89	SET_B	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net230	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	M1	RESET	net89	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M0	clkpos	net105	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	net105	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	S0	clkneg	net122	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net122	net150	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	net150	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net230	net150	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI668	MOSFET	S0	clkpos	net137	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net137	M1	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI630	MOSFET	net150	RESET	net149	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net150	S0	net149	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net149	SET_B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	M1	SET_B	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkneg	net174	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net230	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net150	S0	net169	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net174	M1	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net225	RESET	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net182	net150	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net182	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net150	SET_B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net169	RESET	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	net198	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M0	clkneg	net198	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	RESET	RESET_B	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	M1	M0	net225	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net230	net150	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net150	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	RESET	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI676	MOSFET	M1	M0	net89	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	net89	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net230	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	M1	RESET	net89	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M0	clkpos	net105	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	net105	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	S0	clkneg	net122	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net122	net150	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	net150	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net230	net150	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI668	MOSFET	S0	clkpos	net137	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net137	M1	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI630	MOSFET	net150	RESET	net149	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net150	S0	net149	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net149	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkneg	net174	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net230	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net150	S0	net169	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net174	M1	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI678	MOSFET	net225	RESET	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net182	net150	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	S0	clkpos	net182	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net150	SET_B	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net169	RESET	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	net198	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M0	clkneg	net198	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	RESET	RESET_B	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	M1	M0	net225	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net230	net150	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net150	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.spice b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.spice
index 2a34d85..25c45c8 100644
--- a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.spice
+++ b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_ms__dfbbn_2 CLK_N D RESET_B SET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_1555_410# a_1335_112# a_1934_392# VPB pshort w=1e+06u l=180000u
-+  ad=5.45e+11p pd=5.09e+06u as=2.4e+11p ps=2.48e+06u
-M1001 VPWR a_1555_410# a_2516_368# VPB pshort w=1e+06u l=180000u
-+  ad=3.0275e+12p pd=2.579e+07u as=2.65e+11p ps=2.53e+06u
-M1002 a_1507_508# a_27_74# a_1335_112# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.688e+11p ps=2.4e+06u
-M1003 a_1240_125# a_473_405# VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.90125e+11p pd=1.88e+06u as=2.06398e+12p ps=1.857e+07u
-M1004 a_1640_138# a_200_74# a_1335_112# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=6.1e+11p ps=3.85e+06u
-M1005 VGND SET_B a_867_125# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=3.4925e+11p ps=3.47e+06u
-M1006 a_933_424# a_601_119# a_473_405# VPB pshort w=840000u l=180000u
-+  ad=2.016e+11p pd=2.16e+06u as=4.452e+11p ps=4.42e+06u
-M1007 a_867_125# a_975_322# a_473_405# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.54e+11p ps=1.66e+06u
-M1008 Q a_2516_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1009 a_1832_74# a_1335_112# a_1555_410# VNB nlowvt w=740000u l=150000u
-+  ad=4.979e+11p pd=4.43e+06u as=2.368e+11p ps=2.12e+06u
-M1010 a_1832_74# SET_B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_311_119# a_27_74# a_601_119# VPB pshort w=420000u l=180000u
-+  ad=3.3075e+11p pd=3.39e+06u as=1.386e+11p ps=1.5e+06u
-M1012 VPWR RESET_B a_975_322# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1013 VPWR a_1555_410# a_1507_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_473_405# SET_B VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Q_N a_1555_410# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1016 Q a_2516_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1017 VGND D a_311_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=5.0085e+11p ps=3.93e+06u
-M1018 a_539_503# a_473_405# VPWR VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1019 VPWR a_1555_410# Q_N VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_2516_368# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1934_392# a_975_322# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1335_112# a_200_74# a_1315_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.016e+11p ps=2.16e+06u
-M1023 VGND a_1555_410# a_1640_138# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1555_410# a_975_322# a_1832_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR D a_311_119# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND RESET_B a_975_322# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1027 VPWR SET_B a_1555_410# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_311_119# a_200_74# a_601_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1029 VPWR a_975_322# a_933_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_601_119# a_200_74# a_539_503# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_1555_410# a_2516_368# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1032 VGND a_2516_368# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR CLK_N a_27_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.024e+11p ps=2.78e+06u
-M1034 a_200_74# a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.968e+11p pd=2.77e+06u as=0p ps=0u
-M1035 VGND a_1555_410# Q_N VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1036 a_529_119# a_473_405# VGND VNB nlowvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1037 VGND CLK_N a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1038 a_200_74# a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1039 a_1335_112# a_27_74# a_1240_125# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_473_405# a_601_119# a_867_125# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_1315_424# a_473_405# VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_601_119# a_27_74# a_529_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 Q_N a_1555_410# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1240_125# a_27_74# a_1335_112# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X1 Q a_2516_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_473_405# a_601_119# a_933_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 VPWR a_975_322# a_1934_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VGND a_473_405# a_529_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 Q_N a_1555_410# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VGND a_2516_368# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR SET_B a_473_405# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X8 Q_N a_1555_410# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VGND SET_B a_1832_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_867_125# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X11 a_1640_138# a_1555_410# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X12 VGND a_27_74# a_200_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_1555_410# SET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 Q a_2516_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_1555_410# a_1335_112# a_1832_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_601_119# a_27_74# a_311_119# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X17 a_601_119# a_200_74# a_311_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X18 a_529_119# a_27_74# a_601_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X19 a_1315_424# a_200_74# a_1335_112# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X20 VGND a_473_405# a_1240_125# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X21 a_1335_112# a_200_74# a_1640_138# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X22 a_311_119# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X23 a_975_322# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X24 a_539_503# a_200_74# a_601_119# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X25 VPWR a_27_74# a_200_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 VGND a_1555_410# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 VPWR a_1555_410# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 a_311_119# D VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X29 a_2516_368# a_1555_410# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X30 a_1934_392# a_1335_112# a_1555_410# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X31 a_933_424# a_975_322# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X32 VPWR a_473_405# a_1315_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X33 a_1832_74# a_975_322# a_1555_410# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 a_975_322# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X35 a_2516_368# a_1555_410# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X36 VPWR a_2516_368# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X37 a_1335_112# a_27_74# a_1507_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X38 VPWR a_473_405# a_539_503# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X39 a_27_74# CLK_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X40 a_27_74# CLK_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X41 a_1507_508# a_1555_410# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X42 a_473_405# a_975_322# a_867_125# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X43 a_867_125# a_601_119# a_473_405# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
 .ends
diff --git a/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.cdl b/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.cdl
index 224ed19..743e072 100644
--- a/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.cdl
+++ b/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_ms__dfbbp_1 CLK D RESET_B SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I RESET_B:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI46 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 RESET RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI659 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI676 M1 M0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net89 SET_B VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI642 RESET RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI676 M1 M0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net230 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI677 M1 RESET VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 net105 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net122 net150 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI675 net89 SET_B VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N net150 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net230 net150 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 Q net230 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI668 S0 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI667 net137 M1 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI630 net150 RESET VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI677 M1 RESET VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI3 net150 S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net149 SET_B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI679 M1 SET_B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net230 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net150 S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI670 net174 M1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI678 net225 RESET VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI648 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net182 net150 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI44 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net150 SET_B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 net169 RESET VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 net198 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 RESET RESET_B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI649 net105 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI655 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI680 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net230 net150 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI654 net122 net150 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 Q_N net150 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N net150 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI652 net230 net150 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI668 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI667 net137 M1 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI630 net150 RESET VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI3 net150 S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net149 SET_B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI679 M1 SET_B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net230 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net150 S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 net174 M1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI678 net225 RESET VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net182 net150 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net150 SET_B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 net169 RESET VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 net198 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 RESET RESET_B VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI680 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net230 net150 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N net150 VPB pfet_01v8 m=1 w=1.12 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_ms__dfbbp_1
diff --git a/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.netlist.tsv b/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.netlist.tsv
index f3fbca1..50f01b0 100644
--- a/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.netlist.tsv
+++ b/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ms__dfbbp_1	CLK:I D:I RESET_B:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	db	D	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	RESET	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI676	MOSFET	M1	M0	net89	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net89	SET_B	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net230	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	M1	RESET	net89	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M0	clkpos	net105	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	net105	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	S0	clkneg	net122	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net122	net150	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	net150	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net230	net150	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI668	MOSFET	S0	clkpos	net137	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net137	M1	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI630	MOSFET	net150	RESET	net149	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net150	S0	net149	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net149	SET_B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	M1	SET_B	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkneg	net174	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net230	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net150	S0	net169	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net174	M1	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net225	RESET	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net182	net150	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net182	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net150	SET_B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net169	RESET	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	net198	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M0	clkneg	net198	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	RESET	RESET_B	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	M1	M0	net225	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net230	net150	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net150	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	RESET	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI676	MOSFET	M1	M0	net89	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	net89	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net230	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	M1	RESET	net89	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M0	clkpos	net105	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	net105	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	S0	clkneg	net122	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net122	net150	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	net150	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net230	net150	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI668	MOSFET	S0	clkpos	net137	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net137	M1	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI630	MOSFET	net150	RESET	net149	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net150	S0	net149	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net149	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkneg	net174	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net230	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net150	S0	net169	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net174	M1	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI678	MOSFET	net225	RESET	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net182	net150	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	S0	clkpos	net182	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net150	SET_B	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net169	RESET	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	net198	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M0	clkneg	net198	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	RESET	RESET_B	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	M1	M0	net225	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net230	net150	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net150	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.spice b/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.spice
index 0079415..2cbcef1 100644
--- a/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.spice
+++ b/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ms__dfbbp_1 CLK D RESET_B SET_B VGND VNB VPB VPWR Q Q_N
-M1000 VPWR RESET_B a_1062_93# VPB pshort w=640000u l=180000u
-+  ad=2.7277e+12p pd=2.199e+07u as=1.664e+11p ps=1.8e+06u
-M1001 a_1421_508# a_214_74# a_1314_424# VPB pshort w=420000u l=180000u
-+  ad=1.113e+11p pd=1.37e+06u as=2.667e+11p ps=2.39e+06u
-M1002 Q_N a_1474_446# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.83492e+12p ps=1.558e+07u
-M1003 a_1206_379# a_671_93# VPWR VPB pshort w=840000u l=180000u
-+  ad=3.339e+11p pd=2.85e+06u as=0p ps=0u
-M1004 a_520_87# a_27_74# a_422_125# VNB nlowvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.7605e+11p ps=1.9e+06u
-M1005 a_1314_424# a_27_74# a_1206_379# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_1318_119# a_671_93# VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=0p ps=0u
-M1007 VGND RESET_B a_1062_93# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1008 Q_N a_1474_446# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1009 VPWR a_671_93# a_716_379# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1010 a_1817_392# a_1314_424# a_1474_446# VPB pshort w=1e+06u l=180000u
-+  ad=2.35e+11p pd=2.47e+06u as=3.35e+11p ps=2.67e+06u
-M1011 VPWR a_1062_93# a_1020_379# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.016e+11p ps=2.16e+06u
-M1012 a_1314_424# a_214_74# a_1318_119# VNB nlowvt w=550000u l=150000u
-+  ad=2.317e+11p pd=2.33e+06u as=0p ps=0u
-M1013 a_422_125# D VPWR VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1014 a_1498_74# a_27_74# a_1314_424# VNB nlowvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1015 VPWR a_1474_446# a_1421_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_520_87# a_214_74# a_422_125# VPB pshort w=420000u l=180000u
-+  ad=2.163e+11p pd=2.36e+06u as=0p ps=0u
-M1017 a_214_74# a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1018 VPWR CLK a_27_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1019 VGND a_1474_446# a_2320_410# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1020 a_671_93# SET_B VPWR VPB pshort w=840000u l=180000u
-+  ad=3.024e+11p pd=2.4e+06u as=0p ps=0u
-M1021 VGND a_1474_446# a_1498_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_671_93# a_520_87# a_872_119# VNB nlowvt w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=6.465e+11p ps=4.96e+06u
-M1023 a_1474_446# SET_B VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_1062_93# a_1817_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_606_87# a_214_74# a_520_87# VNB nlowvt w=420000u l=150000u
-+  ad=1.645e+11p pd=1.81e+06u as=0p ps=0u
-M1026 VPWR a_1474_446# a_2320_410# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.184e+11p ps=2.2e+06u
-M1027 a_1474_446# a_1314_424# a_1708_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=4.884e+11p ps=4.28e+06u
-M1028 a_214_74# a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1029 VGND CLK a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1030 a_872_119# a_1062_93# a_671_93# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1708_74# a_1062_93# a_1474_446# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_422_125# D VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_872_119# SET_B VGND VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1708_74# SET_B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1020_379# a_520_87# a_671_93# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND a_671_93# a_606_87# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Q a_2320_410# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1038 Q a_2320_410# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.998e+11p pd=2.02e+06u as=0p ps=0u
-M1039 a_716_379# a_27_74# a_520_87# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1318_119# a_214_74# a_1314_424# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X1 a_1474_446# a_1062_93# a_1708_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_1062_93# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X3 VGND SET_B a_1708_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR D a_422_125# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X5 a_1020_379# a_1062_93# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X6 a_1421_508# a_1474_446# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X7 VPWR SET_B a_1474_446# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 VPWR SET_B a_671_93# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 a_2320_410# a_1474_446# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 a_716_379# a_671_93# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X11 a_671_93# a_1062_93# a_872_119# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X12 a_2320_410# a_1474_446# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X13 a_1474_446# a_1314_424# a_1817_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 a_872_119# a_520_87# a_671_93# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X15 a_1314_424# a_214_74# a_1421_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X16 a_1062_93# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X17 a_1314_424# a_27_74# a_1498_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X18 a_671_93# a_520_87# a_1020_379# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X19 a_606_87# a_671_93# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X20 VGND a_1474_446# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 VPWR a_27_74# a_214_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 VPWR a_671_93# a_1206_379# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X23 a_520_87# a_214_74# a_606_87# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X24 a_1498_74# a_1474_446# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X25 a_520_87# a_27_74# a_716_379# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X26 a_422_125# a_214_74# a_520_87# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X27 a_422_125# a_27_74# a_520_87# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X28 VGND a_27_74# a_214_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_1817_392# a_1062_93# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X30 VGND SET_B a_872_119# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X31 VGND a_671_93# a_1318_119# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X32 VPWR a_1474_446# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X33 VGND a_2320_410# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 a_27_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X35 a_27_74# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X36 a_1206_379# a_27_74# a_1314_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X37 VGND D a_422_125# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X38 a_1708_74# a_1314_424# a_1474_446# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X39 VPWR a_2320_410# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.cdl b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.cdl
index d0d61d3..163607f 100644
--- a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.cdl
+++ b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.cdl
@@ -16,72 +16,72 @@
 
 .SUBCKT sky130_fd_sc_ms__dfrbp_1 CLK D RESET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI651 Q_N s0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI651 Q_N s0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net117 s0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net83 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net92 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net100 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net176 s0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net176 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net116 net117 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net117 s0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 net132 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net83 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net92 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI4 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net148 net117 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI34 net100 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net117 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI655 s0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI652 net176 s0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net176 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net116 net117 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net117 s0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI38 net132 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net148 net117 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net117 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net117 s0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net167 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net176 s0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net176 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N s0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net167 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI45 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI41 db RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net176 s0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net176 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N s0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 db RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__dfrbp_1
diff --git a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.netlist.tsv b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.netlist.tsv
index 4118017..6e9da41 100644
--- a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.netlist.tsv
+++ b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.netlist.tsv
@@ -1,36 +1,36 @@
 sky130_fd_sc_ms__dfrbp_1	CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI651	MOSFET	Q_N	s0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net117	s0	net83	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net83	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net92	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net100	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net100	M1	net92	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net116	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net176	s0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net176	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net116	net117	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	net132	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net132	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net148	net117	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net117	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net148	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net117	s0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net167	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net167	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net176	s0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net176	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	s0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	db	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	s0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net117	s0	net83	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net83	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net92	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net100	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net100	M1	net92	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net116	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net176	s0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net176	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net116	net117	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	net132	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net132	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net148	net117	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net117	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net148	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net117	s0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net167	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net167	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net176	s0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net176	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	s0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.spice b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.spice
index a5a0e99..e86a3a1 100644
--- a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.spice
+++ b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ms__dfrbp_1 CLK D RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_1434_74# a_307_387# a_1224_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=4.33e+11p ps=3.08e+06u
-M1001 a_910_119# a_841_401# a_832_119# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.008e+11p ps=1.32e+06u
-M1002 a_841_401# a_709_463# VGND VNB nlowvt w=640000u l=150000u
-+  ad=3.222e+11p pd=2.44e+06u as=1.3521e+12p ps=1.212e+07u
-M1003 a_1224_74# a_501_387# a_841_401# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Q a_2026_424# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1005 a_709_463# a_501_387# a_38_78# VPB pshort w=420000u l=180000u
-+  ad=2.247e+11p pd=2.75e+06u as=2.31e+11p ps=2.78e+06u
-M1006 VPWR CLK a_307_387# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.90045e+12p pd=1.771e+07u as=3.361e+11p ps=2.92e+06u
-M1007 VPWR a_1482_48# a_1468_471# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1008 Q_N a_1224_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.72e+11p pd=3.44e+06u as=0p ps=0u
-M1009 a_799_463# a_307_387# a_709_463# VPB pshort w=420000u l=180000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1010 a_125_78# D a_38_78# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.394e+11p ps=2.82e+06u
-M1011 VGND CLK a_307_387# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.45475e+11p ps=2.15e+06u
-M1012 a_501_387# a_307_387# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.262e+11p pd=2.14e+06u as=0p ps=0u
-M1013 VGND a_1224_74# a_2026_424# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1014 a_501_387# a_307_387# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1015 Q_N a_1224_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.627e+11p pd=2.19e+06u as=0p ps=0u
-M1016 a_841_401# a_709_463# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1017 a_832_119# a_501_387# a_709_463# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.47e+11p ps=1.54e+06u
-M1018 a_709_463# a_307_387# a_38_78# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND RESET_B a_910_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1224_74# a_307_387# a_841_401# VPB pshort w=1e+06u l=180000u
-+  ad=3.664e+11p pd=3.14e+06u as=0p ps=0u
-M1021 a_1482_48# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1022 VGND a_1482_48# a_1434_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_38_78# D VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR RESET_B a_38_78# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_1224_74# a_1482_48# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1624_74# RESET_B VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1027 a_1482_48# a_1224_74# a_1624_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1028 VPWR a_841_401# a_799_463# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND RESET_B a_125_78# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_1224_74# a_2026_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1031 a_709_463# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Q a_2026_424# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1033 a_1468_471# a_501_387# a_1224_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_841_401# a_307_387# a_1224_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VPWR RESET_B a_1482_48# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X2 VGND RESET_B a_1624_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 VPWR a_2026_424# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_709_463# a_307_387# a_799_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X5 a_1224_74# a_501_387# a_1468_471# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X6 a_910_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 a_125_78# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X8 a_38_78# D a_125_78# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 a_38_78# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X10 a_1468_471# a_1482_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X11 a_2026_424# a_1224_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X12 a_307_387# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VGND a_307_387# a_501_387# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_799_463# a_841_401# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X15 VGND a_1224_74# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_1434_74# a_1482_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X17 a_38_78# a_307_387# a_709_463# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X18 VPWR D a_38_78# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X19 a_38_78# a_501_387# a_709_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X20 a_1482_48# a_1224_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X21 VPWR RESET_B a_709_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X22 VGND a_2026_424# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 VPWR a_1224_74# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_709_463# a_501_387# a_832_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X25 VPWR a_307_387# a_501_387# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 a_832_119# a_841_401# a_910_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 VGND a_709_463# a_841_401# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X28 a_307_387# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_1224_74# a_307_387# a_1434_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X30 a_2026_424# a_1224_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X31 a_841_401# a_501_387# a_1224_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X32 a_1624_74# a_1224_74# a_1482_48# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X33 VPWR a_709_463# a_841_401# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.cdl b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.cdl
index 8a3d550..28f6b94 100644
--- a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.cdl
+++ b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.cdl
@@ -16,72 +16,72 @@
 
 .SUBCKT sky130_fd_sc_ms__dfrbp_2 CLK D RESET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI651 Q_N s0 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI651 Q_N s0 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net117 s0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net83 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net92 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net100 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net176 s0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net176 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net116 net117 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net117 s0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 net132 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net83 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net92 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI4 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net148 net117 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI34 net100 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net117 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI655 s0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI652 net176 s0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net176 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net116 net117 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net117 s0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI38 net132 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net148 net117 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net117 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net117 s0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net167 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net176 s0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net176 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N s0 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net167 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI45 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI41 db RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net176 s0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net176 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N s0 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 db RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__dfrbp_2
diff --git a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.netlist.tsv b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.netlist.tsv
index aebe0ce..a2e1241 100644
--- a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.netlist.tsv
+++ b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.netlist.tsv
@@ -1,36 +1,36 @@
 sky130_fd_sc_ms__dfrbp_2	CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI651	MOSFET	Q_N	s0	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net117	s0	net83	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net83	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net92	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net100	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net100	M1	net92	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net116	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net176	s0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net176	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net116	net117	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	net132	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net132	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net148	net117	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net117	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net148	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net117	s0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net167	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net167	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net176	s0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net176	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	s0	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	db	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	s0	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net117	s0	net83	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net83	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net92	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net100	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net100	M1	net92	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net116	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net176	s0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net176	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net116	net117	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	net132	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net132	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net148	net117	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net117	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net148	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net117	s0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net167	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net167	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net176	s0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net176	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	s0	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.spice b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.spice
index 13e2f1d..90df9f7 100644
--- a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.spice
+++ b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_ms__dfrbp_2 CLK D RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 Q a_2366_352# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=3.6099e+12p ps=2.652e+07u
-M1001 Q a_2366_352# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=2.19475e+12p ps=1.777e+07u
-M1002 a_1800_291# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1003 VPWR a_2366_352# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR RESET_B a_70_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=3.864e+11p ps=3.52e+06u
-M1005 a_1758_389# a_818_418# a_1586_149# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.55e+11p ps=3e+06u
-M1006 a_298_294# a_728_331# a_70_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.632e+11p ps=3.03e+06u
-M1007 a_728_331# CLK VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1008 VGND a_1800_291# a_1499_149# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1009 a_728_331# CLK VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1010 VGND a_1586_149# Q_N VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1011 VPWR RESET_B a_298_294# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=2.247e+11p ps=2.75e+06u
-M1012 a_156_74# D a_70_74# VNB nlowvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1013 a_686_485# a_334_119# VPWR VPB pshort w=420000u l=180000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1014 VPWR a_1800_291# a_1758_389# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_614_81# a_334_119# a_536_81# VNB nlowvt w=420000u l=150000u
-+  ad=3.465e+11p pd=3.33e+06u as=1.008e+11p ps=1.32e+06u
-M1016 VGND a_2366_352# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1586_149# a_728_331# a_1499_149# VNB nlowvt w=420000u l=150000u
-+  ad=2.165e+11p pd=2.13e+06u as=0p ps=0u
-M1018 a_1800_291# a_1586_149# a_1974_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1019 VPWR a_1586_149# a_1800_291# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_2366_352# a_1586_149# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=3.75e+11p pd=2.75e+06u as=0p ps=0u
-M1021 a_1974_74# RESET_B VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_2366_352# a_1586_149# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1023 a_334_119# a_298_294# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.45e+11p pd=5.09e+06u as=0p ps=0u
-M1024 a_298_294# a_728_331# a_686_485# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_334_119# a_818_418# a_1586_149# VNB nlowvt w=740000u l=150000u
-+  ad=5.2345e+11p pd=4.67e+06u as=0p ps=0u
-M1026 a_70_74# a_818_418# a_298_294# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1586_149# a_728_331# a_334_119# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_536_81# RESET_B VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND a_728_331# a_818_418# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.998e+11p ps=2.02e+06u
-M1030 Q_N a_1586_149# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1031 a_334_119# a_298_294# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_614_81# a_818_418# a_298_294# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Q_N a_1586_149# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR a_728_331# a_818_418# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1035 VPWR a_1586_149# Q_N VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_70_74# D VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND RESET_B a_156_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND CLK a_728_331# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_1758_389# a_1800_291# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X2 Q a_2366_352# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_1499_149# a_728_331# a_1586_149# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 Q a_2366_352# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_536_81# a_334_119# a_614_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X6 VPWR a_298_294# a_334_119# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_298_294# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X8 a_298_294# a_818_418# a_614_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 a_70_74# a_728_331# a_298_294# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 VPWR a_334_119# a_686_485# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X11 a_70_74# D a_156_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X12 a_818_418# a_728_331# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VPWR D a_70_74# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X14 VPWR RESET_B a_1800_291# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X15 a_70_74# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X16 a_156_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X17 VPWR a_1586_149# a_2366_352# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 VPWR a_1586_149# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_298_294# a_818_418# a_70_74# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X20 VGND RESET_B a_536_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X21 a_1586_149# a_818_418# a_334_119# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 VPWR a_2366_352# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 VGND a_1586_149# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_1800_291# a_1586_149# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X25 VGND a_1586_149# a_2366_352# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X26 VPWR CLK a_728_331# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 a_1499_149# a_1800_291# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X28 VGND a_298_294# a_334_119# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_1974_74# a_1586_149# a_1800_291# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X30 a_334_119# a_728_331# a_1586_149# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X31 Q_N a_1586_149# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X32 VGND a_2366_352# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 VGND RESET_B a_1974_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X34 a_818_418# a_728_331# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X35 a_686_485# a_728_331# a_298_294# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X36 a_1586_149# a_818_418# a_1758_389# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X37 Q_N a_1586_149# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.cdl b/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.cdl
index db8c375..4ab9294 100644
--- a/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.cdl
+++ b/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ms__dfrtn_1 CLK_N D RESET_B VGND VNB VPB VPWR Q
 *.PININFO CLK_N:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI46 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI46 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net88 s0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net118 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net111 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net88 s0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net103 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net159 s0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net159 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net87 net88 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net118 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net111 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI34 net103 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 net71 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI655 s0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB pshort m=1 w=1 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net187 net88 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI652 net159 s0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net88 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI653 Q net159 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI654 net87 net88 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net88 s0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI38 net71 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8 m=1 w=1 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net187 net88 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net88 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net88 s0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net166 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net159 s0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net159 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK_N VPB pfet_01v8 m=1 w=1 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net166 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI41 db RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net159 s0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net159 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK_N VPB pshort m=1 w=1 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 db RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__dfrtn_1
diff --git a/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.netlist.tsv b/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.netlist.tsv
index b55ae9d..096c64e 100644
--- a/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.netlist.tsv
+++ b/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ms__dfrtn_1	CLK_N:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net88	s0	net118	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net118	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net111	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net103	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net103	M1	net111	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net87	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net159	s0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net159	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net87	net88	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	net71	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net71	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	1	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net187	net88	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net88	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net187	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net88	s0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net166	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net166	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net159	s0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net159	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	pshort	1	1	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	db	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net88	s0	net118	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net118	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net111	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net103	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net103	M1	net111	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net87	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net159	s0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net159	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net87	net88	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	net71	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net71	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	1	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net187	net88	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net88	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net187	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net88	s0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net166	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net166	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net159	s0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net159	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	pfet_01v8	1	1	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.spice b/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.spice
index d114300..b839e6a 100644
--- a/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.spice
+++ b/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ms__dfrtn_1 CLK_N D RESET_B VGND VNB VPB VPWR Q
-M1000 a_856_294# a_714_119# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=7.5e+11p pd=3.5e+06u as=1.65038e+12p ps=1.553e+07u
-M1001 a_1266_119# a_510_74# a_856_294# VPB pshort w=1e+06u l=180000u
-+  ad=4.264e+11p pd=3.34e+06u as=0p ps=0u
-M1002 VGND a_1598_93# a_1550_119# VNB nlowvt w=420000u l=150000u
-+  ad=1.2824e+12p pd=1.089e+07u as=1.008e+11p ps=1.32e+06u
-M1003 a_510_74# a_300_347# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1004 a_1598_93# a_1266_119# a_1736_119# VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.008e+11p ps=1.32e+06u
-M1005 VPWR a_856_294# a_820_457# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 a_714_119# a_510_74# a_33_74# VNB nlowvt w=420000u l=150000u
-+  ad=2.226e+11p pd=1.9e+06u as=2.31e+11p ps=2.78e+06u
-M1007 a_1266_119# a_300_347# a_856_294# VNB nlowvt w=740000u l=150000u
-+  ad=6.134e+11p pd=4.02e+06u as=2.146e+11p ps=2.06e+06u
-M1008 VPWR a_1598_93# a_1550_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1009 VGND RESET_B a_922_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1010 a_1736_119# RESET_B VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_510_74# a_300_347# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.257e+11p pd=2.09e+06u as=0p ps=0u
-M1012 a_714_119# a_300_347# a_33_74# VPB pshort w=420000u l=180000u
-+  ad=2.226e+11p pd=2.74e+06u as=2.31e+11p ps=2.78e+06u
-M1013 VGND CLK_N a_300_347# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.442e+11p ps=2.14e+06u
-M1014 a_820_457# a_510_74# a_714_119# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1598_93# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1016 a_922_119# a_856_294# a_850_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1017 VPWR CLK_N a_300_347# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.9575e+11p ps=2.65e+06u
-M1018 a_714_119# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_850_119# a_300_347# a_714_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_856_294# a_714_119# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_1266_119# a_1934_94# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1022 a_1550_119# a_510_74# a_1266_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_1266_119# a_1598_93# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND RESET_B a_120_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1025 VPWR a_1266_119# a_1934_94# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.184e+11p ps=2.2e+06u
-M1026 Q a_1934_94# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1027 Q a_1934_94# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.146e+11p pd=2.06e+06u as=0p ps=0u
-M1028 a_120_74# D a_33_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1550_508# a_300_347# a_1266_119# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_33_74# D VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR RESET_B a_33_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1550_508# a_1598_93# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X1 a_714_119# a_300_347# a_850_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 a_120_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 a_1550_119# a_1598_93# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 a_1934_94# a_1266_119# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 VPWR a_1934_94# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_33_74# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X7 a_856_294# a_510_74# a_1266_119# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_714_119# a_510_74# a_820_457# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X9 a_1266_119# a_300_347# a_1550_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X10 a_1266_119# a_510_74# a_1550_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X11 VGND a_714_119# a_856_294# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VPWR RESET_B a_714_119# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X13 a_33_74# a_510_74# a_714_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X14 a_33_74# D a_120_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X15 a_300_347# CLK_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 VGND a_300_347# a_510_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_850_119# a_856_294# a_922_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X18 VGND RESET_B a_1736_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X19 a_820_457# a_856_294# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X20 a_300_347# CLK_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 a_922_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X22 VPWR D a_33_74# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X23 VPWR a_300_347# a_510_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X24 a_1736_119# a_1266_119# a_1598_93# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X25 VPWR RESET_B a_1598_93# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X26 a_856_294# a_300_347# a_1266_119# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 a_1934_94# a_1266_119# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X28 VGND a_1934_94# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_33_74# a_300_347# a_714_119# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X30 a_1598_93# a_1266_119# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X31 VPWR a_714_119# a_856_294# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.cdl b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.cdl
index 099802d..315f932 100644
--- a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.cdl
+++ b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ms__dfrtp_1 CLK D RESET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI46 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net108 s0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net74 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net83 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net108 s0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net91 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net167 s0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net167 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net107 net108 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net74 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net83 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 net123 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI4 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI34 net91 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net146 net108 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI655 s0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net108 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI652 net167 s0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI653 Q net167 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net107 net108 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net108 s0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI38 net123 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net146 net108 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net108 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net108 s0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net158 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net167 s0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net167 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net158 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI41 db RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net167 s0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net167 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 db RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__dfrtp_1
diff --git a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.netlist.tsv b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.netlist.tsv
index ecaee68..93225ae 100644
--- a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.netlist.tsv
+++ b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ms__dfrtp_1	CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net108	s0	net74	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net74	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net83	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net91	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net91	M1	net83	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net107	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net167	s0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net167	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net107	net108	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	net123	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net123	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net146	net108	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net108	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net146	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net108	s0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net158	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net158	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net167	s0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net167	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	db	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net108	s0	net74	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net74	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net83	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net91	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net91	M1	net83	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net107	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net167	s0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net167	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net107	net108	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	net123	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net123	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net146	net108	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net108	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net146	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net108	s0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net158	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net158	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net167	s0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net167	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.spice b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.spice
index 38a47c3..9e35ae0 100644
--- a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.spice
+++ b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ms__dfrtp_1 CLK D RESET_B VGND VNB VPB VPWR Q
-M1000 a_1656_81# RESET_B VGND VNB nlowvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.33593e+12p ps=1.182e+07u
-M1001 a_493_387# a_299_387# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.262e+11p pd=2.14e+06u as=0p ps=0u
-M1002 a_821_138# a_493_387# a_701_463# VNB nlowvt w=420000u l=150000u
-+  ad=9.03e+10p pd=1.27e+06u as=1.407e+11p ps=1.51e+06u
-M1003 VGND a_1867_409# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1004 a_1266_74# a_299_387# a_833_400# VPB pshort w=1e+06u l=180000u
-+  ad=4.39e+11p pd=3.4e+06u as=3.5125e+11p ps=2.95e+06u
-M1005 VPWR a_1867_409# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=1.82245e+12p pd=1.716e+07u as=3.64e+11p ps=2.89e+06u
-M1006 VGND RESET_B a_894_138# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 a_701_463# a_299_387# a_30_78# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.541e+11p ps=2.89e+06u
-M1008 VPWR a_833_400# a_791_463# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1009 VGND RESET_B a_117_78# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1010 a_1471_493# a_493_387# a_1266_74# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1011 a_1867_409# a_1266_74# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1012 a_894_138# a_833_400# a_821_138# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_1518_203# a_1476_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1014 a_701_463# a_493_387# a_30_78# VPB pshort w=420000u l=180000u
-+  ad=2.31e+11p pd=2.78e+06u as=2.31e+11p ps=2.78e+06u
-M1015 VPWR a_1518_203# a_1471_493# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1476_81# a_299_387# a_1266_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=4.58e+11p ps=3.28e+06u
-M1017 a_1518_203# a_1266_74# a_1656_81# VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1018 a_30_78# D VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR RESET_B a_30_78# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1518_203# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1021 VPWR CLK a_299_387# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.1375e+11p ps=2.92e+06u
-M1022 a_791_463# a_299_387# a_701_463# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND CLK a_299_387# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.45475e+11p ps=2.15e+06u
-M1024 VPWR a_1266_74# a_1518_203# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_493_387# a_299_387# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1026 a_117_78# D a_30_78# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1266_74# a_493_387# a_833_400# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.921e+11p ps=2.81e+06u
-M1028 a_1867_409# a_1266_74# VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1029 a_833_400# a_701_463# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_701_463# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_833_400# a_701_463# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_701_463# a_299_387# a_791_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X1 a_1471_493# a_1518_203# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X2 a_1518_203# a_1266_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X3 VGND a_1266_74# a_1867_409# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X4 a_299_387# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_833_400# a_493_387# a_1266_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_299_387# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND a_701_463# a_833_400# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 Q a_1867_409# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_791_463# a_833_400# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X10 Q a_1867_409# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VGND RESET_B a_1656_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X12 a_30_78# a_493_387# a_701_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X13 a_1656_81# a_1266_74# a_1518_203# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X14 VPWR RESET_B a_1518_203# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X15 a_894_138# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X16 a_30_78# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X17 VPWR a_701_463# a_833_400# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 VPWR RESET_B a_701_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X19 VPWR a_299_387# a_493_387# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 VPWR a_1266_74# a_1867_409# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X21 a_117_78# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X22 a_30_78# D a_117_78# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X23 a_30_78# a_299_387# a_701_463# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X24 a_833_400# a_299_387# a_1266_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X25 VGND a_299_387# a_493_387# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 a_701_463# a_493_387# a_821_138# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 a_1476_81# a_1518_203# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X28 a_1266_74# a_493_387# a_1471_493# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X29 a_821_138# a_833_400# a_894_138# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X30 VPWR D a_30_78# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X31 a_1266_74# a_299_387# a_1476_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.cdl b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.cdl
index bec2354..d2501ac 100644
--- a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.cdl
+++ b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ms__dfrtp_2 CLK D RESET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI46 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net108 s0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net74 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net83 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net108 s0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net91 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net167 s0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net167 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net107 net108 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net74 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net83 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 net123 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI4 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI34 net91 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net139 net108 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI655 s0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net108 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI652 net167 s0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI653 Q net167 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net107 net108 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net108 s0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI38 net123 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net139 net108 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net108 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net108 s0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net158 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net167 s0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net167 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net158 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI41 db RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net167 s0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net167 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 db RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__dfrtp_2
diff --git a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.netlist.tsv b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.netlist.tsv
index 7c38205..d124024 100644
--- a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.netlist.tsv
+++ b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ms__dfrtp_2	CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net108	s0	net74	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net74	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net83	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net91	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net91	M1	net83	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net107	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net167	s0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net167	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net107	net108	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	net123	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net123	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net139	net108	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net108	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net139	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net108	s0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net158	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net158	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net167	s0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net167	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	db	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net108	s0	net74	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net74	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net83	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net91	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net91	M1	net83	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net107	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net167	s0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net167	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net107	net108	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	net123	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net123	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net139	net108	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net108	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net139	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net108	s0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net158	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net158	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net167	s0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net167	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.spice b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.spice
index c6baefe..5242337 100644
--- a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.spice
+++ b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ms__dfrtp_2 CLK D RESET_B VGND VNB VPB VPWR Q
-M1000 a_837_359# a_699_463# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=3.38125e+11p pd=2.8e+06u as=2.1627e+12p ps=1.993e+07u
-M1001 VGND RESET_B a_895_138# VNB nlowvt w=420000u l=150000u
-+  ad=1.91777e+12p pd=1.512e+07u as=1.008e+11p ps=1.32e+06u
-M1002 VPWR a_1271_74# a_1525_212# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=2.226e+11p ps=1.9e+06u
-M1003 a_1271_74# a_493_387# a_837_359# VNB nlowvt w=740000u l=150000u
-+  ad=4.58e+11p pd=3.28e+06u as=2.405e+11p ps=2.13e+06u
-M1004 a_699_463# a_493_387# a_30_78# VPB pshort w=420000u l=180000u
-+  ad=2.31e+11p pd=2.78e+06u as=2.289e+11p ps=2.77e+06u
-M1005 VGND a_1525_212# a_1481_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1006 a_789_463# a_306_119# a_699_463# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1007 a_1271_74# a_306_119# a_837_359# VPB pshort w=1e+06u l=180000u
-+  ad=4.32625e+11p pd=3.6e+06u as=0p ps=0u
-M1008 a_895_138# a_837_359# a_817_138# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1009 a_1481_493# a_493_387# a_1271_74# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1010 a_1924_409# a_1271_74# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1011 VPWR a_837_359# a_789_463# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND RESET_B a_117_78# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1013 a_493_387# a_306_119# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.98825e+11p pd=2.05e+06u as=0p ps=0u
-M1014 a_30_78# D VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR RESET_B a_30_78# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND CLK a_306_119# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1017 a_699_463# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_1525_212# a_1481_493# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1525_212# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1924_409# a_1271_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1021 a_1663_81# RESET_B VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1022 a_1525_212# a_1271_74# a_1663_81# VNB nlowvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1023 a_837_359# a_699_463# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_817_138# a_493_387# a_699_463# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.47e+11p ps=1.54e+06u
-M1025 VPWR CLK a_306_119# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.968e+11p ps=2.77e+06u
-M1026 a_699_463# a_306_119# a_30_78# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.82e+06u
-M1027 a_493_387# a_306_119# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.968e+11p pd=2.77e+06u as=0p ps=0u
-M1028 a_117_78# D a_30_78# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Q a_1924_409# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1030 VPWR a_1924_409# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Q a_1924_409# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1032 a_1481_81# a_306_119# a_1271_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND a_1924_409# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1525_212# a_1271_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X1 a_817_138# a_837_359# a_895_138# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 Q a_1924_409# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_306_119# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_30_78# a_306_119# a_699_463# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 VPWR a_699_463# a_837_359# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_306_119# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_1481_81# a_1525_212# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X8 VGND a_1271_74# a_1924_409# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_837_359# a_306_119# a_1271_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_699_463# a_306_119# a_789_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X11 a_699_463# a_493_387# a_817_138# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X12 VGND a_306_119# a_493_387# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VGND a_699_463# a_837_359# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_789_463# a_837_359# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X15 VPWR a_1924_409# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_30_78# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X17 Q a_1924_409# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_1271_74# a_493_387# a_1481_493# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X19 a_895_138# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X20 VGND a_1924_409# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 a_1271_74# a_306_119# a_1481_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X22 VPWR a_306_119# a_493_387# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_1481_493# a_1525_212# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X24 a_117_78# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X25 a_1663_81# a_1271_74# a_1525_212# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X26 a_30_78# D a_117_78# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 VPWR a_1271_74# a_1924_409# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X28 a_837_359# a_493_387# a_1271_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 VGND RESET_B a_1663_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X30 a_30_78# a_493_387# a_699_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X31 VPWR RESET_B a_699_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X32 VPWR D a_30_78# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X33 VPWR RESET_B a_1525_212# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
 .ends
diff --git a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.cdl b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.cdl
index 07153f5..9d63edb 100644
--- a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.cdl
+++ b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ms__dfrtp_4 CLK D RESET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI46 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net88 s0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net118 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net111 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net88 s0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net103 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net159 s0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net159 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net87 net88 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net118 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net111 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 net71 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI34 net103 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI655 s0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net187 net88 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI652 net159 s0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net88 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI653 Q net159 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI654 net87 net88 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net88 s0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI38 net71 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net187 net88 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net88 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net88 s0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net166 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net159 s0 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net159 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net166 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI41 db RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net159 s0 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net159 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 db RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__dfrtp_4
diff --git a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.netlist.tsv b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.netlist.tsv
index 5c36a29..8b62745 100644
--- a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.netlist.tsv
+++ b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ms__dfrtp_4	CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net88	s0	net118	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net118	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net111	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net103	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net103	M1	net111	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net87	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net159	s0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net159	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net87	net88	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	net71	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net71	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net187	net88	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net88	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net187	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net88	s0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net166	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net166	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net159	s0	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net159	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	db	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net88	s0	net118	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net118	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net111	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net103	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net103	M1	net111	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net87	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net159	s0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net159	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net87	net88	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	net71	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net71	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net187	net88	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net88	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net187	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net88	s0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net166	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net166	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net159	s0	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net159	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.spice b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.spice
index 22fe6ee..feb2fc9 100644
--- a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.spice
+++ b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.spice
@@ -16,82 +16,43 @@
 
 
 .subckt sky130_fd_sc_ms__dfrtp_4 CLK D RESET_B VGND VNB VPB VPWR Q
-M1000 a_702_463# a_303_395# a_37_78# VNB nlowvt w=420000u l=150000u
-+  ad=1.47e+11p pd=1.54e+06u as=2.31e+11p ps=2.78e+06u
-M1001 VGND CLK a_303_395# VNB nlowvt w=740000u l=150000u
-+  ad=2.086e+12p pd=1.709e+07u as=2.45475e+11p ps=2.15e+06u
-M1002 a_497_395# a_303_395# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.262e+11p pd=2.14e+06u as=0p ps=0u
-M1003 VGND a_2013_409# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.847e+11p ps=4.27e+06u
-M1004 a_1353_392# a_497_395# a_834_355# VNB nlowvt w=740000u l=150000u
-+  ad=4.58e+11p pd=3.28e+06u as=9.435e+11p ps=4.03e+06u
-M1005 VGND RESET_B a_124_78# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1006 VPWR a_834_355# a_792_463# VPB pshort w=420000u l=180000u
-+  ad=2.9869e+12p pd=2.378e+07u as=8.82e+10p ps=1.26e+06u
-M1007 a_1630_493# a_497_395# a_1353_392# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=6.511e+11p ps=4.41e+06u
-M1008 VPWR a_1353_392# a_2013_409# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.268e+11p ps=2.22e+06u
-M1009 Q a_2013_409# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.552e+11p pd=5.65e+06u as=0p ps=0u
-M1010 VPWR CLK a_303_395# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.32375e+11p ps=2.92e+06u
-M1011 a_834_355# a_702_463# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_1678_395# a_1630_493# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_497_395# a_303_395# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1014 a_702_463# a_497_395# a_37_78# VPB pshort w=420000u l=180000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.289e+11p ps=2.77e+06u
-M1015 a_834_355# a_702_463# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1016 a_702_463# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_124_78# D a_37_78# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_2013_409# a_1353_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1019 a_792_463# a_303_395# a_702_463# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1353_392# a_303_395# a_834_355# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_2013_409# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_1678_395# a_1647_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1023 VGND a_2013_409# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_890_138# a_834_355# a_812_138# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.008e+11p ps=1.32e+06u
-M1025 a_2013_409# a_1353_392# VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1678_395# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1027 VPWR a_1353_392# a_1678_395# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Q a_2013_409# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_2013_409# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1827_81# RESET_B VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1031 a_1678_395# a_1353_392# a_1827_81# VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1032 Q a_2013_409# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND RESET_B a_890_138# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_37_78# D VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR RESET_B a_37_78# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_812_138# a_497_395# a_702_463# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1647_81# a_303_395# a_1353_392# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Q a_2013_409# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_890_138# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X1 a_792_463# a_834_355# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X2 a_303_395# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR a_2013_409# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_702_463# a_497_395# a_812_138# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 VPWR a_2013_409# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_124_78# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 Q a_2013_409# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VPWR RESET_B a_702_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X9 a_37_78# D a_124_78# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 a_1353_392# a_303_395# a_1647_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X11 VPWR a_702_463# a_834_355# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 a_1678_395# a_1353_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X13 VPWR a_303_395# a_497_395# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_37_78# a_497_395# a_702_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X15 a_37_78# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X16 a_1827_81# a_1353_392# a_1678_395# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X17 a_1353_392# a_497_395# a_1630_493# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X18 a_834_355# a_497_395# a_1353_392# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 VGND RESET_B a_1827_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X20 a_1630_493# a_1678_395# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X21 Q a_2013_409# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 VGND a_303_395# a_497_395# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 VPWR a_1353_392# a_2013_409# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X24 VPWR D a_37_78# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X25 VPWR RESET_B a_1678_395# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X26 a_812_138# a_834_355# a_890_138# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 Q a_2013_409# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 VGND a_2013_409# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_303_395# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X30 a_834_355# a_303_395# a_1353_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X31 a_702_463# a_303_395# a_792_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X32 VGND a_702_463# a_834_355# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 a_2013_409# a_1353_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X34 a_1647_81# a_1678_395# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X35 Q a_2013_409# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X36 a_37_78# a_303_395# a_702_463# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X37 VGND a_1353_392# a_2013_409# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X38 VGND a_2013_409# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.cdl b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.cdl
index 12fbd17..06f9e0d 100644
--- a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.cdl
+++ b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.cdl
@@ -16,72 +16,72 @@
 
 .SUBCKT sky130_fd_sc_ms__dfsbp_1 CLK D SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI36 net65 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net112 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI36 net65 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net97 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net105 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net80 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net189 S0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net189 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 Q_N S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net136 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI44 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net161 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI656 M1 M0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net112 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net97 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net105 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 S1 S0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net80 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net189 S0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net189 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI49 Q_N S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI38 S0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net172 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI37 net136 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net161 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net172 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI5 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI24 S0 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI648 S1 S0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net189 S0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI658 M1 M0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net189 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI50 Q_N S0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI663 net189 S0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net189 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI50 Q_N S0 VPB pfet_01v8 m=1 w=1.12 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_ms__dfsbp_1
diff --git a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.netlist.tsv b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.netlist.tsv
index ef4dcd6..c224932 100644
--- a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.netlist.tsv
+++ b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.netlist.tsv
@@ -1,36 +1,36 @@
 sky130_fd_sc_ms__dfsbp_1	CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI36	MOSFET	net65	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net80	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net112	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net65	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net97	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net105	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net105	S1	net97	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net112	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net80	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net189	S0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net189	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	Q_N	S0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net136	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net136	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net161	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net161	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net172	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net172	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net189	S0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net189	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI50	MOSFET	Q_N	S0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net65	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net80	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net112	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net65	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net97	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net105	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net105	S1	net97	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net112	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net80	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net189	S0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net189	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	Q_N	S0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net136	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net136	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net161	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net161	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net172	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	S0	clkpos	net172	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net189	S0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net189	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI50	MOSFET	Q_N	S0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.spice b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.spice
index a0a7d8a..bd198a7 100644
--- a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.spice
+++ b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ms__dfsbp_1 CLK D SET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_1262_74# a_596_81# VGND VNB nlowvt w=640000u l=150000u
-+  ad=2.176e+11p pd=1.96e+06u as=1.56945e+12p ps=1.386e+07u
-M1001 a_1257_341# a_596_81# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=3.565e+11p pd=3.01e+06u as=1.91615e+12p ps=1.7e+07u
-M1002 a_1358_377# a_225_74# a_1257_341# VPB pshort w=1e+06u l=180000u
-+  ad=5.371e+11p pd=4.81e+06u as=0p ps=0u
-M1003 VGND D a_27_80# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.82e+06u
-M1004 a_596_81# a_225_74# a_27_80# VNB nlowvt w=420000u l=150000u
-+  ad=2.562e+11p pd=2.06e+06u as=0p ps=0u
-M1005 a_1520_508# a_398_74# a_1358_377# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1006 VGND a_779_380# a_748_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 a_731_463# a_225_74# a_596_81# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.344e+11p ps=1.48e+06u
-M1008 Q_N a_1358_377# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1009 a_596_81# a_398_74# a_27_80# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1010 VPWR a_1510_48# a_1520_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1510_48# a_1358_377# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1012 VPWR CLK a_225_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1013 a_398_74# a_225_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1014 a_1358_377# SET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1061_74# a_596_81# a_779_380# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.113e+11p ps=1.37e+06u
-M1016 VPWR SET_B a_779_380# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
-M1017 VPWR a_1358_377# a_1510_48# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.533e+11p ps=1.57e+06u
-M1018 a_1358_377# a_398_74# a_1262_74# VNB nlowvt w=640000u l=150000u
-+  ad=2.139e+11p pd=2e+06u as=0p ps=0u
-M1019 a_398_74# a_225_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1020 VPWR a_779_380# a_731_463# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Q a_2113_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1022 a_748_81# a_398_74# a_596_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR D a_27_80# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND SET_B a_1540_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1025 VGND a_1358_377# a_2113_74# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1026 VGND SET_B a_1061_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Q a_2113_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1028 a_1540_74# a_1510_48# a_1462_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1029 a_779_380# a_596_81# VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Q_N a_1358_377# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1031 a_1462_74# a_225_74# a_1358_377# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND CLK a_225_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1033 VPWR a_1358_377# a_2113_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
+X0 VPWR a_2113_74# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_1520_508# a_1510_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X2 VPWR a_596_81# a_779_380# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X3 a_1462_74# a_1510_48# a_1540_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 VPWR a_596_81# a_1257_341# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_1358_377# a_225_74# a_1462_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X6 a_779_380# a_596_81# a_1061_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 VGND a_1358_377# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_27_80# a_398_74# a_596_81# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X9 a_1257_341# a_225_74# a_1358_377# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_27_80# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X11 a_779_380# SET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X12 a_748_81# a_779_380# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X13 a_1540_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X14 VPWR a_225_74# a_398_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_596_81# a_225_74# a_731_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X16 a_27_80# D VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X17 a_1510_48# a_1358_377# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X18 a_2113_74# a_1358_377# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X19 VPWR SET_B a_1358_377# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X20 VPWR a_1358_377# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 a_731_463# a_779_380# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X22 VGND a_2113_74# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 VGND a_596_81# a_1262_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X24 VGND a_225_74# a_398_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 a_1262_74# a_398_74# a_1358_377# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X26 a_27_80# a_225_74# a_596_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 a_596_81# a_398_74# a_748_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X28 a_225_74# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_2113_74# a_1358_377# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X30 a_1061_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X31 a_1358_377# a_398_74# a_1520_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X32 VGND a_1358_377# a_1510_48# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X33 a_225_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.cdl b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.cdl
index f3cca89..e9d160f 100644
--- a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.cdl
+++ b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.cdl
@@ -16,72 +16,72 @@
 
 .SUBCKT sky130_fd_sc_ms__dfsbp_2 CLK D SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI36 net64 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net111 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI36 net64 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net96 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net104 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net79 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net188 S0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net188 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 Q_N S0 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net135 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI44 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net160 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI656 M1 M0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net111 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net96 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net104 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 S1 S0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net79 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net188 S0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net188 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI49 Q_N S0 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI38 S0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net171 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI37 net135 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net160 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net171 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI5 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI24 S0 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI648 S1 S0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net188 S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI658 M1 M0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net188 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI50 Q_N S0 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI663 net188 S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net188 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI50 Q_N S0 VPB pfet_01v8 m=2 w=1.12 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_ms__dfsbp_2
diff --git a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.netlist.tsv b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.netlist.tsv
index 27855d2..4ffd0ae 100644
--- a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.netlist.tsv
+++ b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.netlist.tsv
@@ -1,36 +1,36 @@
 sky130_fd_sc_ms__dfsbp_2	CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI36	MOSFET	net64	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net79	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net111	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net64	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net96	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net104	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net104	S1	net96	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net111	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net79	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net188	S0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net188	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	Q_N	S0	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net135	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net135	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net160	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net160	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net171	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net171	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net188	S0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net188	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI50	MOSFET	Q_N	S0	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net64	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net79	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net111	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net64	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net96	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net104	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net104	S1	net96	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net111	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net79	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net188	S0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net188	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	Q_N	S0	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net135	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net135	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net160	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net160	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net171	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	S0	clkpos	net171	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net188	S0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net188	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI50	MOSFET	Q_N	S0	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.spice b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.spice
index c5f9992..4cfbe21 100644
--- a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.spice
+++ b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_ms__dfsbp_2 CLK D SET_B VGND VNB VPB VPWR Q Q_N
-M1000 VPWR SET_B a_757_401# VPB pshort w=420000u l=180000u
-+  ad=2.75e+12p pd=2.354e+07u as=1.407e+11p ps=1.51e+06u
-M1001 a_595_97# a_398_74# a_27_74# VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=2.352e+11p ps=2.8e+06u
-M1002 VGND SET_B a_1531_118# VNB nlowvt w=420000u l=150000u
-+  ad=2.28115e+12p pd=1.92e+07u as=1.008e+11p ps=1.32e+06u
-M1003 a_1501_92# a_1339_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.533e+11p pd=1.57e+06u as=0p ps=0u
-M1004 VGND a_2221_74# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1005 a_709_463# a_225_74# a_595_97# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1006 a_1261_341# a_595_97# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=3.69625e+11p pd=3.16e+06u as=0p ps=0u
-M1007 VGND a_1339_74# a_2221_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1008 Q_N a_1339_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1009 VPWR a_757_401# a_709_463# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1524_508# a_398_74# a_1339_74# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=5.425e+11p ps=4.65e+06u
-M1011 Q a_2221_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1012 a_1261_74# a_595_97# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1013 Q_N a_1339_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1014 VPWR a_2221_74# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_1339_74# a_2221_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1016 Q a_2221_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_595_97# a_225_74# a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=2.226e+11p pd=1.9e+06u as=2.394e+11p ps=2.82e+06u
-M1018 VPWR CLK a_225_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1019 a_398_74# a_225_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1020 a_757_401# a_595_97# VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_398_74# a_225_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1022 a_1339_74# a_398_74# a_1261_74# VNB nlowvt w=640000u l=150000u
-+  ad=2.314e+11p pd=2.12e+06u as=0p ps=0u
-M1023 a_1531_118# a_1501_92# a_1453_118# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1024 VGND a_1339_74# Q_N VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_757_401# a_731_97# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1026 VPWR a_1339_74# a_1501_92# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=2.481e+11p ps=2.24e+06u
-M1027 a_1339_74# a_225_74# a_1261_341# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND SET_B a_1001_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1029 VPWR D a_27_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_1339_74# Q_N VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_1501_92# a_1524_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1001_74# a_595_97# a_757_401# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1033 VGND D a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1339_74# SET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND CLK a_225_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1036 a_731_97# a_398_74# a_595_97# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1453_118# a_225_74# a_1339_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# a_398_74# a_595_97# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X1 a_1001_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 VGND a_1339_74# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_1453_118# a_1501_92# a_1531_118# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 a_1339_74# a_398_74# a_1524_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X5 a_595_97# a_398_74# a_731_97# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X6 a_1501_92# a_1339_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X7 a_2221_74# a_1339_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_731_97# a_757_401# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 a_757_401# a_595_97# a_1001_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 a_2221_74# a_1339_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 VPWR a_595_97# a_757_401# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X12 Q a_2221_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VPWR SET_B a_1339_74# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X14 a_1261_74# a_398_74# a_1339_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 a_27_74# a_225_74# a_595_97# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X16 VPWR a_595_97# a_1261_341# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X17 VPWR a_225_74# a_398_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 a_27_74# D VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X19 a_595_97# a_225_74# a_709_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X20 a_757_401# SET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X21 a_1339_74# a_225_74# a_1453_118# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X22 a_709_463# a_757_401# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X23 VPWR a_1339_74# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 VGND a_225_74# a_398_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 a_1261_341# a_225_74# a_1339_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X26 VGND a_1339_74# a_1501_92# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 VGND a_595_97# a_1261_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X28 a_225_74# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 VPWR a_2221_74# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X30 a_1524_508# a_1501_92# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X31 Q_N a_1339_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X32 Q a_2221_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 a_1531_118# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X34 a_27_74# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X35 VGND a_2221_74# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X36 a_225_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X37 Q_N a_1339_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/dfstp/sky130_fd_sc_ms__dfstp_1.cdl b/cells/dfstp/sky130_fd_sc_ms__dfstp_1.cdl
index 46da7ef..51608fc 100644
--- a/cells/dfstp/sky130_fd_sc_ms__dfstp_1.cdl
+++ b/cells/dfstp/sky130_fd_sc_ms__dfstp_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ms__dfstp_1 CLK D SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI36 net60 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net80 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI36 net60 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net92 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net100 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net75 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net180 S0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net180 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net127 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI44 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net152 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI656 M1 M0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net80 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net92 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net100 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 S1 S0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net75 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net180 S0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net180 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI38 S0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net163 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI37 net127 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net152 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net163 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI5 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI24 S0 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI648 S1 S0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net180 S0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI658 M1 M0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net180 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net180 S0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net180 VPB pfet_01v8 m=1 w=1.12 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_ms__dfstp_1
diff --git a/cells/dfstp/sky130_fd_sc_ms__dfstp_1.netlist.tsv b/cells/dfstp/sky130_fd_sc_ms__dfstp_1.netlist.tsv
index db56cb3..8ea52e7 100644
--- a/cells/dfstp/sky130_fd_sc_ms__dfstp_1.netlist.tsv
+++ b/cells/dfstp/sky130_fd_sc_ms__dfstp_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ms__dfstp_1	CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI36	MOSFET	net60	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net75	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net80	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net60	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net92	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net100	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net100	S1	net92	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net80	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net75	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net180	S0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net180	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net127	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net127	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net152	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net152	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net163	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net163	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net180	S0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net180	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net60	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net75	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net80	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net60	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net92	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net100	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net100	S1	net92	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net80	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net75	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net180	S0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net180	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net127	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net127	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net152	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net152	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net163	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	S0	clkpos	net163	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net180	S0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net180	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfstp/sky130_fd_sc_ms__dfstp_1.spice b/cells/dfstp/sky130_fd_sc_ms__dfstp_1.spice
index 8617513..5babed0 100644
--- a/cells/dfstp/sky130_fd_sc_ms__dfstp_1.spice
+++ b/cells/dfstp/sky130_fd_sc_ms__dfstp_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ms__dfstp_1 CLK D SET_B VGND VNB VPB VPWR Q
-M1000 a_760_395# a_604_74# VPWR VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=1.7201e+12p ps=1.561e+07u
-M1001 a_1200_341# a_604_74# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=3.69625e+11p pd=3.16e+06u as=0p ps=0u
-M1002 VPWR a_1470_48# a_1460_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1003 a_1215_74# a_604_74# VGND VNB nlowvt w=640000u l=150000u
-+  ad=2.4e+11p pd=2.03e+06u as=1.40335e+12p ps=1.213e+07u
-M1004 VPWR CLK a_224_350# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.024e+11p ps=2.78e+06u
-M1005 a_1470_48# a_1301_392# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1006 a_1301_392# SET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=5.212e+11p pd=4.59e+06u as=0p ps=0u
-M1007 a_1301_392# a_398_74# a_1215_74# VNB nlowvt w=640000u l=150000u
-+  ad=2.139e+11p pd=2e+06u as=0p ps=0u
-M1008 VPWR D a_27_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=2.31e+11p ps=2.78e+06u
-M1009 VGND SET_B a_1027_118# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1010 a_398_74# a_224_350# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1011 a_1027_118# a_604_74# a_760_395# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1012 VPWR SET_B a_760_395# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_604_74# a_224_350# a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=2.226e+11p pd=1.9e+06u as=2.9565e+11p ps=3.17e+06u
-M1014 Q a_1902_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1015 a_712_463# a_224_350# a_604_74# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.344e+11p ps=1.48e+06u
-M1016 a_1470_48# a_1301_392# VPWR VPB pshort w=420000u l=180000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1017 a_604_74# a_398_74# a_27_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1422_74# a_224_350# a_1301_392# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1019 a_1500_74# a_1470_48# a_1422_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1020 a_398_74# a_224_350# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1021 a_1301_392# a_224_350# a_1200_341# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_760_395# a_740_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1023 VGND SET_B a_1500_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_740_74# a_398_74# a_604_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Q a_1902_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1026 VGND a_1301_392# a_1902_74# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1027 a_1460_508# a_398_74# a_1301_392# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND D a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_1301_392# a_1902_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.184e+11p ps=2.2e+06u
-M1030 VPWR a_760_395# a_712_463# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND CLK a_224_350# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
+X0 a_1460_508# a_1470_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X1 a_1027_118# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 VPWR SET_B a_1301_392# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X3 VPWR a_604_74# a_1200_341# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VGND a_1902_74# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_1215_74# a_398_74# a_1301_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VPWR a_1902_74# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_1500_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X8 a_1902_74# a_1301_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X9 a_760_395# a_604_74# a_1027_118# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 a_1902_74# a_1301_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X11 a_1200_341# a_224_350# a_1301_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 VPWR a_224_350# a_398_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VPWR a_604_74# a_760_395# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X14 VPWR a_1301_392# a_1470_48# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X15 a_760_395# SET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X16 a_604_74# a_398_74# a_740_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X17 a_712_463# a_760_395# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X18 a_1422_74# a_1470_48# a_1500_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X19 VGND a_224_350# a_398_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_1301_392# a_224_350# a_1422_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X21 a_27_74# a_398_74# a_604_74# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X22 VGND a_604_74# a_1215_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X23 a_224_350# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_27_74# a_224_350# a_604_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X25 VGND a_1301_392# a_1470_48# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X26 a_224_350# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 a_740_74# a_760_395# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X28 a_27_74# D VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X29 a_1301_392# a_398_74# a_1460_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X30 a_27_74# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X31 a_604_74# a_224_350# a_712_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
 .ends
diff --git a/cells/dfstp/sky130_fd_sc_ms__dfstp_2.cdl b/cells/dfstp/sky130_fd_sc_ms__dfstp_2.cdl
index fa4b7d0..801d617 100644
--- a/cells/dfstp/sky130_fd_sc_ms__dfstp_2.cdl
+++ b/cells/dfstp/sky130_fd_sc_ms__dfstp_2.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ms__dfstp_2 CLK D SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI36 net60 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net80 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI36 net60 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net92 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net100 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net75 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net180 S0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net180 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net127 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI44 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net152 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI656 M1 M0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net80 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net92 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net100 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 S1 S0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net75 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net180 S0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net180 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI38 S0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net163 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI37 net127 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net152 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net163 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI5 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI24 S0 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI648 S1 S0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net180 S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI658 M1 M0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net180 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net180 S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net180 VPB pfet_01v8 m=2 w=1.12 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_ms__dfstp_2
diff --git a/cells/dfstp/sky130_fd_sc_ms__dfstp_2.netlist.tsv b/cells/dfstp/sky130_fd_sc_ms__dfstp_2.netlist.tsv
index 5b4c01d..86c027a 100644
--- a/cells/dfstp/sky130_fd_sc_ms__dfstp_2.netlist.tsv
+++ b/cells/dfstp/sky130_fd_sc_ms__dfstp_2.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ms__dfstp_2	CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI36	MOSFET	net60	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net75	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net80	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net60	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net92	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net100	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net100	S1	net92	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net80	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net75	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net180	S0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net180	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net127	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net127	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net152	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net152	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net163	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net163	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net180	S0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net180	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net60	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net75	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net80	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net60	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net92	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net100	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net100	S1	net92	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net80	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net75	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net180	S0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net180	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net127	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net127	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net152	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net152	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net163	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	S0	clkpos	net163	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net180	S0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net180	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfstp/sky130_fd_sc_ms__dfstp_2.spice b/cells/dfstp/sky130_fd_sc_ms__dfstp_2.spice
index c4f111c..4a4cbfa 100644
--- a/cells/dfstp/sky130_fd_sc_ms__dfstp_2.spice
+++ b/cells/dfstp/sky130_fd_sc_ms__dfstp_2.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ms__dfstp_2 CLK D SET_B VGND VNB VPB VPWR Q
-M1000 a_1278_74# a_612_74# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.6502e+12p ps=1.426e+07u
-M1001 a_1356_74# a_398_74# a_1278_74# VNB nlowvt w=640000u l=150000u
-+  ad=2.713e+11p pd=2.31e+06u as=0p ps=0u
-M1002 a_1057_118# a_612_74# a_767_384# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1003 a_1356_74# a_225_74# a_1269_341# VPB pshort w=1e+06u l=180000u
-+  ad=5.278e+11p pd=4.58e+06u as=3.69625e+11p ps=3.16e+06u
-M1004 VGND SET_B a_1596_118# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=1.68e+06u
-M1005 VGND a_2022_94# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1006 VPWR a_1356_74# a_2022_94# VPB pshort w=1e+06u l=180000u
-+  ad=2.34017e+12p pd=1.968e+07u as=2.8e+11p ps=2.56e+06u
-M1007 a_1356_74# SET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1489_118# a_225_74# a_1356_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.617e+11p pd=1.61e+06u as=0p ps=0u
-M1009 a_767_384# a_612_74# VPWR VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1010 a_1524_508# a_398_74# a_1356_74# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1011 a_1269_341# a_612_74# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_781_74# a_398_74# a_612_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.919e+11p ps=2.23e+06u
-M1013 VGND a_1356_74# a_2022_94# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1014 VPWR CLK a_225_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1015 a_398_74# a_225_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1016 VPWR SET_B a_767_384# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_398_74# a_225_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1018 a_612_74# a_225_74# a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.0635e+11p ps=3.21e+06u
-M1019 a_1566_92# a_1356_74# VPWR VPB pshort w=420000u l=180000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1020 VPWR D a_27_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1021 a_719_456# a_225_74# a_612_74# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.344e+11p ps=1.48e+06u
-M1022 VGND SET_B a_1057_118# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_612_74# a_398_74# a_27_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_767_384# a_781_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Q a_2022_94# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Q a_2022_94# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1027 a_1566_92# a_1356_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1028 VPWR a_1566_92# a_1524_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_2022_94# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1596_118# a_1566_92# a_1489_118# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND D a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR a_767_384# a_719_456# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND CLK a_225_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
+X0 a_2022_94# a_1356_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 Q a_2022_94# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_1489_118# a_1566_92# a_1596_118# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 a_719_456# a_767_384# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X4 VGND a_2022_94# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VPWR SET_B a_1356_74# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X6 a_27_74# a_225_74# a_612_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 VPWR a_1356_74# a_1566_92# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X8 a_1356_74# a_225_74# a_1489_118# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 a_1356_74# a_398_74# a_1524_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X10 a_781_74# a_767_384# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X11 Q a_2022_94# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_1057_118# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X13 VPWR a_2022_94# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_1596_118# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X15 VPWR a_225_74# a_398_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VPWR a_612_74# a_1269_341# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X17 a_27_74# D VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X18 a_612_74# a_398_74# a_781_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X19 VGND a_225_74# a_398_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_27_74# a_398_74# a_612_74# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X21 a_1269_341# a_225_74# a_1356_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X22 VPWR a_612_74# a_767_384# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X23 a_225_74# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_767_384# a_612_74# a_1057_118# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X25 a_1524_508# a_1566_92# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X26 a_767_384# SET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X27 a_1278_74# a_398_74# a_1356_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X28 a_612_74# a_225_74# a_719_456# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X29 a_27_74# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X30 VGND a_612_74# a_1278_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X31 a_225_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 VGND a_1356_74# a_1566_92# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X33 a_2022_94# a_1356_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/dfstp/sky130_fd_sc_ms__dfstp_4.cdl b/cells/dfstp/sky130_fd_sc_ms__dfstp_4.cdl
index f77a1b7..8bce38b 100644
--- a/cells/dfstp/sky130_fd_sc_ms__dfstp_4.cdl
+++ b/cells/dfstp/sky130_fd_sc_ms__dfstp_4.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ms__dfstp_4 CLK D SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI36 net60 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net80 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI36 net60 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net92 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net100 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net75 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net180 S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net180 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net127 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI44 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net152 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI656 M1 M0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net80 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net92 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net100 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 S1 S0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net75 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net180 S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net180 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI38 S0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net163 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI37 net127 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net152 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net163 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI5 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI24 S0 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI648 S1 S0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net180 S0 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI658 M1 M0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net180 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net180 S0 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net180 VPB pfet_01v8 m=4 w=1.12 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_ms__dfstp_4
diff --git a/cells/dfstp/sky130_fd_sc_ms__dfstp_4.netlist.tsv b/cells/dfstp/sky130_fd_sc_ms__dfstp_4.netlist.tsv
index 1c29f12..7c2295f 100644
--- a/cells/dfstp/sky130_fd_sc_ms__dfstp_4.netlist.tsv
+++ b/cells/dfstp/sky130_fd_sc_ms__dfstp_4.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ms__dfstp_4	CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI36	MOSFET	net60	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net75	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net80	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net60	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net92	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net100	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net100	S1	net92	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net80	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net75	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net180	S0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net180	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net127	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net127	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net152	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net152	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net163	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net163	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net180	S0	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net180	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net60	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net75	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net80	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net60	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net92	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net100	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net100	S1	net92	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net80	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net75	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net180	S0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net180	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net127	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net127	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net152	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net152	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net163	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	S0	clkpos	net163	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net180	S0	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net180	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfstp/sky130_fd_sc_ms__dfstp_4.spice b/cells/dfstp/sky130_fd_sc_ms__dfstp_4.spice
index 8853bc1..f016c89 100644
--- a/cells/dfstp/sky130_fd_sc_ms__dfstp_4.spice
+++ b/cells/dfstp/sky130_fd_sc_ms__dfstp_4.spice
@@ -16,82 +16,43 @@
 
 
 .subckt sky130_fd_sc_ms__dfstp_4 CLK D SET_B VGND VNB VPB VPWR Q
-M1000 VGND a_1324_392# a_1940_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.1906e+12p pd=1.727e+07u as=2.627e+11p ps=2.19e+06u
-M1001 a_612_74# a_398_74# a_27_74# VPB pshort w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=2.352e+11p ps=2.8e+06u
-M1002 a_719_463# a_225_74# a_612_74# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1003 VGND a_767_402# a_732_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1004 VGND SET_B a_1514_88# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1005 a_1484_62# a_1324_392# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1006 a_1324_392# a_398_74# a_1225_74# VNB nlowvt w=640000u l=150000u
-+  ad=2.1145e+11p pd=2e+06u as=2.528e+11p ps=2.07e+06u
-M1007 a_1514_88# a_1484_62# a_1436_88# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1008 Q a_1940_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.477e+11p pd=4.17e+06u as=0p ps=0u
-M1009 VGND a_1940_74# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_767_402# a_719_463# VPB pshort w=420000u l=180000u
-+  ad=2.5187e+12p pd=2.304e+07u as=0p ps=0u
-M1011 VPWR SET_B a_767_402# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1012 a_1484_62# a_1324_392# VPWR VPB pshort w=420000u l=180000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
-M1013 a_732_74# a_398_74# a_612_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.89e+11p ps=1.74e+06u
-M1014 VPWR a_1484_62# a_1483_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1015 a_1436_88# a_225_74# a_1324_392# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND SET_B a_1035_118# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1017 VGND a_1940_74# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_398_74# a_225_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1019 a_1324_392# SET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=5.212e+11p pd=4.59e+06u as=0p ps=0u
-M1020 a_1940_74# a_1324_392# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1021 VPWR a_1324_392# a_1940_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Q a_1940_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1023 a_612_74# a_225_74# a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.0635e+11p ps=3.21e+06u
-M1024 VPWR CLK a_225_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1025 a_1324_392# a_225_74# a_1223_347# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.64375e+11p ps=3.1e+06u
-M1026 a_1035_118# a_612_74# a_767_402# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.491e+11p ps=1.55e+06u
-M1027 a_398_74# a_225_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1028 a_1225_74# a_612_74# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_1940_74# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Q a_1940_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR D a_27_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND D a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1223_347# a_612_74# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Q a_1940_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND CLK a_225_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1036 a_1483_508# a_398_74# a_1324_392# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR a_1940_74# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_767_402# a_612_74# VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# a_398_74# a_612_74# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X1 a_1225_74# a_398_74# a_1324_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_1514_88# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 a_1223_347# a_225_74# a_1324_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_27_74# a_225_74# a_612_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 a_1436_88# a_1484_62# a_1514_88# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X6 VGND a_1940_74# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_767_402# a_612_74# a_1035_118# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X8 a_612_74# a_225_74# a_719_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X9 VPWR a_225_74# a_398_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_1035_118# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X11 a_612_74# a_398_74# a_732_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X12 a_719_463# a_767_402# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X13 Q a_1940_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_1483_508# a_1484_62# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X15 a_1940_74# a_1324_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_1940_74# a_1324_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X17 VPWR a_1940_74# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 a_1324_392# a_225_74# a_1436_88# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X19 a_27_74# D VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X20 VPWR a_612_74# a_767_402# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X21 VGND a_225_74# a_398_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 a_1324_392# a_398_74# a_1483_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X23 VPWR a_1324_392# a_1484_62# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X24 a_225_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 a_767_402# SET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X26 Q a_1940_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 VGND a_612_74# a_1225_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X28 a_225_74# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 VPWR a_612_74# a_1223_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X30 VPWR a_1324_392# a_1940_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X31 VPWR a_1940_74# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 VGND a_1324_392# a_1484_62# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X33 VPWR SET_B a_1324_392# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X34 a_732_74# a_767_402# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X35 Q a_1940_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X36 VGND a_1940_74# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X37 a_27_74# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X38 Q a_1940_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.cdl b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.cdl
index 214ff95..5eaf971 100644
--- a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.cdl
+++ b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_ms__dfxbp_1 CLK D VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI657 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net52 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 net60 S1 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net76 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI657 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 Q_N net60 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI670 net60 S1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net111 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net132 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI656 net52 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI666 Q_N net60 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI646 Q S1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 net60 S1 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net76 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 S1 S0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 Q_N net60 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 net60 S1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net111 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net132 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI666 Q_N net60 VPB pfet_01v8 m=1 w=1.12 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_ms__dfxbp_1
diff --git a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.netlist.tsv b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.netlist.tsv
index 835ee61..9338e02 100644
--- a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.netlist.tsv
+++ b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_ms__dfxbp_1	CLK:I D:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI657	MOSFET	M0	clkpos	net52	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net52	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	net60	S1	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	db	D	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net76	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net76	S1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	Q_N	net60	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net132	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net111	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net60	S1	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net111	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net132	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	Q_N	net60	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net52	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net52	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	net60	S1	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net76	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net76	S1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	Q_N	net60	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net132	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net111	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net60	S1	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net111	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net132	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	Q_N	net60	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.spice b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.spice
index 977f6b9..1b06c33 100644
--- a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.spice
+++ b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__dfxbp_1 CLK D VGND VNB VPB VPWR Q Q_N
-M1000 Q_N a_1644_112# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.08e+11p pd=2.79e+06u as=1.78195e+12p ps=1.538e+07u
-M1001 VPWR a_1005_120# a_1191_120# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.55e+06u
-M1002 a_546_447# a_27_74# a_423_503# VNB nlowvt w=420000u l=150000u
-+  ad=1.51375e+11p pd=1.66e+06u as=1.176e+11p ps=1.4e+06u
-M1003 a_653_508# a_27_74# a_546_447# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.02475e+11p ps=2.16e+06u
-M1004 VPWR a_1191_120# a_1161_482# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1005 VGND a_701_463# a_713_102# VNB nlowvt w=420000u l=150000u
-+  ad=1.71272e+12p pd=1.365e+07u as=8.82e+10p ps=1.26e+06u
-M1006 Q a_1191_120# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1007 VPWR a_1191_120# a_1644_112# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.268e+11p ps=2.22e+06u
-M1008 a_701_463# a_546_447# VGND VNB nlowvt w=550000u l=150000u
-+  ad=2.365e+11p pd=2.26e+06u as=0p ps=0u
-M1009 a_423_503# D VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1005_120# a_208_368# a_701_463# VNB nlowvt w=550000u l=150000u
-+  ad=2.593e+11p pd=2.18e+06u as=0p ps=0u
-M1011 a_701_463# a_546_447# VPWR VPB pshort w=840000u l=180000u
-+  ad=4.83e+11p pd=2.83e+06u as=0p ps=0u
-M1012 a_713_102# a_208_368# a_546_447# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_1191_120# a_1143_146# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1014 a_208_368# a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1015 VPWR CLK a_27_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.08e+11p ps=2.79e+06u
-M1016 a_1161_482# a_208_368# a_1005_120# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=2.628e+11p ps=2.39e+06u
-M1017 a_208_368# a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=3.252e+11p pd=2.59e+06u as=0p ps=0u
-M1018 VGND a_1005_120# a_1191_120# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1019 VPWR a_701_463# a_653_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1143_146# a_27_74# a_1005_120# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_423_503# D VPWR VPB pshort w=420000u l=180000u
-+  ad=2.8015e+11p pd=2.61e+06u as=0p ps=0u
-M1022 VGND a_1191_120# a_1644_112# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1023 a_1005_120# a_27_74# a_701_463# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Q a_1191_120# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1025 VGND CLK a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1026 a_546_447# a_208_368# a_423_503# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Q_N a_1644_112# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
+X0 VGND D a_423_503# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X1 VPWR a_1191_120# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VGND a_1644_112# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR a_546_447# a_701_463# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X4 VPWR D a_423_503# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X5 a_653_508# a_701_463# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X6 a_546_447# a_208_368# a_713_102# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 a_713_102# a_701_463# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X8 a_423_503# a_208_368# a_546_447# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X9 VPWR a_27_74# a_208_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_546_447# a_27_74# a_653_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X11 a_1005_120# a_208_368# a_1161_482# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X12 VGND a_27_74# a_208_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_701_463# a_27_74# a_1005_120# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X14 a_423_503# a_27_74# a_546_447# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X15 a_1005_120# a_27_74# a_1143_146# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X16 a_1143_146# a_1191_120# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X17 a_1161_482# a_1191_120# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X18 VGND a_1191_120# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_1644_112# a_1191_120# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X20 a_27_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 a_1644_112# a_1191_120# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X22 a_1191_120# a_1005_120# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X23 VPWR a_1644_112# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_701_463# a_208_368# a_1005_120# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X25 VGND a_546_447# a_701_463# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X26 a_27_74# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 a_1191_120# a_1005_120# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.cdl b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.cdl
index f8ddde7..2f3bda3 100644
--- a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.cdl
+++ b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_ms__dfxbp_2 CLK D VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI657 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net52 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net72 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI657 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net52 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net72 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 S1 S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 net96 S1 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 Q_N net96 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 net96 S1 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 Q_N net96 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI643 net111 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net128 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI651 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI653 M1 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 net96 S1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net111 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net128 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI670 net96 S1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI666 Q_N net96 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI666 Q_N net96 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 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_ms__dfxbp_2
diff --git a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.netlist.tsv b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.netlist.tsv
index 45e4ab0..3309180 100644
--- a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.netlist.tsv
+++ b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_ms__dfxbp_2	CLK:I D:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI657	MOSFET	M0	clkpos	net52	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net52	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	db	D	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net72	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net72	S1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	net96	S1	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	Q_N	net96	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net128	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net111	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net111	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net128	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net96	S1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	Q_N	net96	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net52	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net52	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net72	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net72	S1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	net96	S1	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	Q_N	net96	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net128	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net111	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net111	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net128	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net96	S1	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	Q_N	net96	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.spice b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.spice
index d47f4b9..f8d81b5 100644
--- a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.spice
+++ b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.spice
@@ -16,70 +16,37 @@
 
 
 .subckt sky130_fd_sc_ms__dfxbp_2 CLK D VGND VNB VPB VPWR Q Q_N
-M1000 a_1248_128# a_27_74# a_1003_424# VNB nlowvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.9205e+11p ps=3.36e+06u
-M1001 Q a_1290_102# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=2.10485e+12p ps=1.739e+07u
-M1002 VGND a_753_284# a_717_102# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1003 Q_N a_1835_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1004 a_454_503# D VPWR VPB pshort w=420000u l=180000u
-+  ad=1.9985e+11p pd=2.13e+06u as=2.66788e+12p ps=2.211e+07u
-M1005 a_753_284# a_561_445# VGND VNB nlowvt w=550000u l=150000u
-+  ad=3.87e+11p pd=2.98e+06u as=0p ps=0u
-M1006 VGND a_1835_368# Q_N VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_1835_368# Q_N VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.024e+11p ps=2.78e+06u
-M1008 a_1290_102# a_1003_424# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1009 VGND a_1290_102# a_1248_128# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR CLK a_27_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1011 a_209_368# a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1012 a_705_445# a_27_74# a_561_445# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.268e+11p ps=1.92e+06u
-M1013 a_209_368# a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=3.252e+11p pd=2.59e+06u as=0p ps=0u
-M1014 a_753_284# a_561_445# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1015 a_1003_424# a_27_74# a_753_284# VPB pshort w=840000u l=180000u
-+  ad=4.662e+11p pd=3.4e+06u as=0p ps=0u
-M1016 VPWR a_1290_102# a_1835_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1017 VPWR a_1003_424# a_1290_102# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1003_424# a_209_368# a_753_284# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_1290_102# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_717_102# a_209_368# a_561_445# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.66075e+11p ps=1.73e+06u
-M1021 VGND a_1290_102# a_1835_368# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1022 Q a_1290_102# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1023 VPWR a_1290_102# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_561_445# a_209_368# a_454_503# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1211_479# a_209_368# a_1003_424# VPB pshort w=420000u l=180000u
-+  ad=1.659e+11p pd=1.63e+06u as=0p ps=0u
-M1026 VPWR a_1290_102# a_1211_479# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Q_N a_1835_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND a_1003_424# a_1290_102# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1029 VPWR a_753_284# a_705_445# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_454_503# D VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1031 VGND CLK a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1032 a_561_445# a_27_74# a_454_503# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1248_128# a_1290_102# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X1 a_454_503# a_209_368# a_561_445# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X2 VGND D a_454_503# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 a_1835_368# a_1290_102# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_753_284# a_209_368# a_1003_424# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X5 a_1835_368# a_1290_102# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X6 VPWR a_27_74# a_209_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_561_445# a_27_74# a_705_445# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X8 a_1003_424# a_27_74# a_1248_128# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 a_753_284# a_27_74# a_1003_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X10 Q_N a_1835_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_561_445# a_209_368# a_717_102# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X12 VGND a_561_445# a_753_284# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X13 VGND a_27_74# a_209_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_454_503# a_27_74# a_561_445# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X15 Q_N a_1835_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 VPWR D a_454_503# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X17 a_1003_424# a_209_368# a_1211_479# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X18 VGND a_1835_368# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 Q a_1290_102# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_27_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 VGND a_1290_102# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 VPWR a_561_445# a_753_284# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X23 VPWR a_1003_424# a_1290_102# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X24 a_1290_102# a_1003_424# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 a_1290_102# a_1003_424# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X26 Q a_1290_102# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 a_705_445# a_753_284# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X28 a_717_102# a_753_284# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X29 a_1211_479# a_1290_102# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X30 VPWR a_1290_102# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X31 a_27_74# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X32 VPWR a_1835_368# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.cdl b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.cdl
index c7bd499..8ffd246 100644
--- a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.cdl
+++ b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_ms__dfxtp_1 CLK D VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI657 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net43 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net63 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI657 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net43 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net63 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 S1 S0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI643 net94 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net111 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI651 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net94 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net111 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI653 M1 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 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_ms__dfxtp_1
diff --git a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.netlist.tsv b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.netlist.tsv
index fb98d02..ebb37a7 100644
--- a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.netlist.tsv
+++ b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_ms__dfxtp_1	CLK:I D:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI657	MOSFET	M0	clkpos	net43	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net43	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	db	D	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net63	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net63	S1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net111	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net94	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net94	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net111	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net43	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net43	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net63	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net63	S1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net111	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net94	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net94	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net111	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.spice b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.spice
index 1676a68..5c0f744 100644
--- a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.spice
+++ b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__dfxtp_1 CLK D VGND VNB VPB VPWR Q
-M1000 VPWR a_1014_424# a_1210_314# VPB pshort w=840000u l=180000u
-+  ad=1.41472e+12p pd=1.248e+07u as=2.352e+11p ps=2.24e+06u
-M1001 a_1168_124# a_27_74# a_1014_424# VNB nlowvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=2.362e+11p ps=2.07e+06u
-M1002 a_209_368# a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.553e+11p pd=2.17e+06u as=1.2645e+12p ps=1.059e+07u
-M1003 a_1014_424# a_27_74# a_713_458# VPB pshort w=840000u l=180000u
-+  ad=2.667e+11p pd=2.39e+06u as=4.41e+11p ps=2.73e+06u
-M1004 a_713_458# a_564_463# VGND VNB nlowvt w=550000u l=150000u
-+  ad=2.18125e+11p pd=2.05e+06u as=0p ps=0u
-M1005 a_1121_508# a_209_368# a_1014_424# VPB pshort w=420000u l=180000u
-+  ad=1.869e+11p pd=1.73e+06u as=0p ps=0u
-M1006 a_1014_424# a_209_368# a_713_458# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_457_503# D VGND VNB nlowvt w=420000u l=150000u
-+  ad=3.1125e+11p pd=2.43e+06u as=0p ps=0u
-M1008 VGND a_1014_424# a_1210_314# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1009 VPWR CLK a_27_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1010 a_209_368# a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1011 VPWR a_713_458# a_671_503# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1012 a_564_463# a_209_368# a_457_503# VPB pshort w=420000u l=180000u
-+  ad=1.841e+11p pd=1.95e+06u as=1.841e+11p ps=1.95e+06u
-M1013 Q a_1210_314# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1014 VGND a_713_458# a_731_101# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1015 a_671_503# a_27_74# a_564_463# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_731_101# a_209_368# a_564_463# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.575e+11p ps=1.73e+06u
-M1017 a_564_463# a_27_74# a_457_503# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_713_458# a_564_463# VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Q a_1210_314# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1020 a_457_503# D VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_1210_314# a_1168_124# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND CLK a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1023 VPWR a_1210_314# a_1121_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_457_503# a_209_368# a_564_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X1 VPWR a_564_463# a_713_458# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 VGND a_1210_314# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR a_27_74# a_209_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_1210_314# a_1014_424# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X5 a_564_463# a_209_368# a_731_101# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X6 VGND D a_457_503# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 a_1014_424# a_27_74# a_1168_124# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X8 VPWR D a_457_503# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X9 a_1168_124# a_1210_314# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 a_27_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_1121_508# a_1210_314# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X12 VGND a_27_74# a_209_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_1210_314# a_1014_424# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X14 VPWR a_1210_314# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_564_463# a_27_74# a_671_503# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X16 VGND a_564_463# a_713_458# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X17 a_713_458# a_27_74# a_1014_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X18 a_731_101# a_713_458# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X19 a_713_458# a_209_368# a_1014_424# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X20 a_457_503# a_27_74# a_564_463# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X21 a_1014_424# a_209_368# a_1121_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X22 a_27_74# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_671_503# a_713_458# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
 .ends
diff --git a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.cdl b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.cdl
index 1ade946..fdb2e00 100644
--- a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.cdl
+++ b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_ms__dfxtp_2 CLK D VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI657 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net43 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net63 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI657 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net43 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net63 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 S1 S0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI643 net94 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net111 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI651 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net94 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net111 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI653 M1 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 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_ms__dfxtp_2
diff --git a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.netlist.tsv b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.netlist.tsv
index 3a6bcc2..1ce38e0 100644
--- a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.netlist.tsv
+++ b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_ms__dfxtp_2	CLK:I D:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI657	MOSFET	M0	clkpos	net43	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net43	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	db	D	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net63	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net63	S1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net111	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net94	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net94	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net111	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net43	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net43	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net63	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net63	S1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net111	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net94	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net94	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net111	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.spice b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.spice
index ba86f93..7f78de9 100644
--- a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.spice
+++ b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_ms__dfxtp_2 CLK D VGND VNB VPB VPWR Q
-M1000 VGND a_695_459# a_708_101# VNB nlowvt w=420000u l=150000u
-+  ad=1.65997e+12p pd=1.34e+07u as=1.008e+11p ps=1.32e+06u
-M1001 VGND a_1217_314# a_1172_124# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1002 VPWR a_695_459# a_647_504# VPB pshort w=420000u l=180000u
-+  ad=1.72835e+12p pd=1.511e+07u as=1.008e+11p ps=1.32e+06u
-M1003 a_695_459# a_541_429# VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=0p ps=0u
-M1004 a_695_459# a_541_429# VPWR VPB pshort w=840000u l=180000u
-+  ad=4.998e+11p pd=2.87e+06u as=0p ps=0u
-M1005 Q a_1217_314# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1006 VPWR a_1217_314# a_1128_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.869e+11p ps=1.73e+06u
-M1007 a_434_508# D VPWR VPB pshort w=420000u l=180000u
-+  ad=2.18225e+11p pd=2.34e+06u as=0p ps=0u
-M1008 Q a_1217_314# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1009 a_1022_424# a_209_368# a_695_459# VNB nlowvt w=550000u l=150000u
-+  ad=2.4555e+11p pd=2.35e+06u as=0p ps=0u
-M1010 VPWR CLK a_27_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1011 a_209_368# a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1012 a_541_429# a_209_368# a_434_508# VPB pshort w=420000u l=180000u
-+  ad=2.12625e+11p pd=2.29e+06u as=0p ps=0u
-M1013 a_434_508# D VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1014 VPWR a_1217_314# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_708_101# a_209_368# a_541_429# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.5225e+11p ps=1.67e+06u
-M1016 a_541_429# a_27_74# a_434_508# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1172_124# a_27_74# a_1022_424# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1022_424# a_27_74# a_695_459# VPB pshort w=840000u l=180000u
-+  ad=2.625e+11p pd=2.38e+06u as=0p ps=0u
-M1019 VPWR a_1022_424# a_1217_314# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1020 VGND a_1022_424# a_1217_314# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1021 VGND a_1217_314# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_647_504# a_27_74# a_541_429# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1128_508# a_209_368# a_1022_424# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND CLK a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1025 a_209_368# a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.775e+11p pd=2.23e+06u as=0p ps=0u
+X0 VPWR D a_434_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X1 Q a_1217_314# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_695_459# a_209_368# a_1022_424# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X3 a_1022_424# a_209_368# a_1128_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X4 VPWR a_541_429# a_695_459# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 VGND a_1217_314# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR a_27_74# a_209_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_434_508# a_209_368# a_541_429# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X8 a_434_508# a_27_74# a_541_429# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 a_647_504# a_695_459# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X10 a_1128_508# a_1217_314# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X11 a_708_101# a_695_459# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X12 a_1217_314# a_1022_424# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X13 a_1172_124# a_1217_314# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X14 VGND a_27_74# a_209_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 Q a_1217_314# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 VGND a_541_429# a_695_459# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X17 a_1217_314# a_1022_424# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 VPWR a_1217_314# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_27_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_541_429# a_27_74# a_647_504# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X21 a_541_429# a_209_368# a_708_101# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X22 a_1022_424# a_27_74# a_1172_124# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X23 a_695_459# a_27_74# a_1022_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X24 a_27_74# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 VGND D a_434_508# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.cdl b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.cdl
index 3a9957c..9c9ff7b 100644
--- a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.cdl
+++ b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_ms__dfxtp_4 CLK D VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI657 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net43 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net63 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI657 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net43 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net63 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 S1 S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI643 net94 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net111 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI651 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net94 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net111 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI653 M1 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 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_ms__dfxtp_4
diff --git a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.netlist.tsv b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.netlist.tsv
index c3b322c..18066b3 100644
--- a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.netlist.tsv
+++ b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_ms__dfxtp_4	CLK:I D:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI657	MOSFET	M0	clkpos	net43	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net43	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	db	D	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net63	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net63	S1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net111	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net94	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net94	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net111	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	db	D	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net43	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net43	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net63	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net63	S1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net111	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net94	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net94	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net111	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.spice b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.spice
index 2571a78..04a6eae 100644
--- a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.spice
+++ b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.spice
@@ -16,66 +16,35 @@
 
 
 .subckt sky130_fd_sc_ms__dfxtp_4 CLK D VGND VNB VPB VPWR Q
-M1000 VPWR a_1226_296# a_1144_508# VPB pshort w=420000u l=180000u
-+  ad=2.2454e+12p pd=1.922e+07u as=1.869e+11p ps=1.73e+06u
-M1001 Q a_1226_296# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1002 VGND a_1226_296# Q VNB nlowvt w=740000u l=150000u
-+  ad=1.88282e+12p pd=1.54e+07u as=4.44e+11p ps=4.16e+06u
-M1003 Q a_1226_296# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR a_1226_296# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_654_503# a_27_74# a_547_485# VPB pshort w=420000u l=180000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.6485e+11p ps=1.73e+06u
-M1006 a_1144_508# a_209_368# a_1037_424# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=2.667e+11p ps=2.39e+06u
-M1007 Q a_1226_296# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Q a_1226_296# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_440_503# D VPWR VPB pshort w=420000u l=180000u
-+  ad=1.6485e+11p pd=1.73e+06u as=0p ps=0u
-M1010 VPWR a_1226_296# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_696_458# a_547_485# VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.98e+11p pd=1.97e+06u as=0p ps=0u
-M1012 VPWR CLK a_27_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1013 a_209_368# a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1014 a_547_485# a_209_368# a_440_503# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1226_296# a_1037_424# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1016 VGND a_696_458# a_735_102# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1017 VGND a_1226_296# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1037_424# a_27_74# a_696_458# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=4.2e+11p ps=2.68e+06u
-M1019 VPWR a_1037_424# a_1226_296# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_1226_296# a_1178_124# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.323e+11p ps=1.47e+06u
-M1021 a_735_102# a_209_368# a_547_485# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.51375e+11p ps=1.66e+06u
-M1022 a_440_503# D VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1023 a_547_485# a_27_74# a_440_503# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1037_424# a_209_368# a_696_458# VNB nlowvt w=550000u l=150000u
-+  ad=2.152e+11p pd=1.97e+06u as=0p ps=0u
-M1025 a_209_368# a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.516e+11p pd=2.16e+06u as=0p ps=0u
-M1026 VGND a_1037_424# a_1226_296# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1027 VPWR a_696_458# a_654_503# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND CLK a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1029 a_696_458# a_547_485# VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1178_124# a_27_74# a_1037_424# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Q a_1226_296# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VGND a_1226_296# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VGND a_547_485# a_696_458# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X3 a_1037_424# a_27_74# a_1178_124# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 VGND a_1226_296# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_440_503# a_209_368# a_547_485# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X6 a_696_458# a_27_74# a_1037_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 a_1037_424# a_209_368# a_1144_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X8 VPWR a_27_74# a_209_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VPWR a_1037_424# a_1226_296# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X10 a_547_485# a_209_368# a_735_102# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X11 Q a_1226_296# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_1226_296# a_1037_424# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 Q a_1226_296# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_1144_508# a_1226_296# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X15 VPWR a_1226_296# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VPWR a_547_485# a_696_458# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X17 VPWR D a_440_503# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X18 VPWR a_1226_296# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 VGND a_27_74# a_209_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_27_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 a_654_503# a_696_458# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X22 VGND D a_440_503# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X23 a_1226_296# a_1037_424# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X24 a_735_102# a_696_458# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X25 a_547_485# a_27_74# a_654_503# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X26 a_696_458# a_209_368# a_1037_424# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X27 a_440_503# a_27_74# a_547_485# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X28 Q a_1226_296# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X29 a_27_74# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X30 a_1178_124# a_1226_296# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/diode/sky130_fd_sc_ms__diode_2.spice b/cells/diode/sky130_fd_sc_ms__diode_2.spice
index e6de7a2..988b0bf 100644
--- a/cells/diode/sky130_fd_sc_ms__diode_2.spice
+++ b/cells/diode/sky130_fd_sc_ms__diode_2.spice
@@ -16,5 +16,5 @@
 
 
 .subckt sky130_fd_sc_ms__diode_2 DIODE VGND VNB VPB VPWR
-D0 VNB DIODE ndiode p=7.32e+06u a=6.417e+11p
+X0 VNB DIODE sky130_fd_pr__diode_pw2nd p=7.32e+06u a=6.417e+11p
 .ends
diff --git a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.cdl b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.cdl
index 2dd0900..842a5d7 100644
--- a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.cdl
+++ b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_ms__dlclkp_1 CLK GATE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net39 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net51 CLK VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net51 m1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 m1 M0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net58 GATE VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI662 net39 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 GCLK net51 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net82 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net95 CLK VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net51 m1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net103 GATE VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI664 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI659 net51 CLK VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net51 m1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 m1 M0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 GCLK net51 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net58 GATE VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 GCLK net51 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net82 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net95 CLK VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net51 m1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 net103 GATE VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net51 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__dlclkp_1
diff --git a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.netlist.tsv b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.netlist.tsv
index dec0163..d646627 100644
--- a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.netlist.tsv
+++ b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_ms__dlclkp_1	CLK:I GATE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI662	MOSFET	net39	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkpos	net39	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net51	CLK	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net51	m1	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	M0	clkneg	net58	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net58	GATE	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net51	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkneg	net82	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net82	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	M0	clkpos	net103	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net95	CLK	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net51	m1	net95	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net103	GATE	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net51	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net39	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkpos	net39	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net51	CLK	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net51	m1	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	M0	clkneg	net58	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net58	GATE	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	GCLK	net51	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkneg	net82	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net82	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	M0	clkpos	net103	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net95	CLK	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net51	m1	net95	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net103	GATE	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net51	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.spice b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.spice
index 8ec9ecf..133fd07 100644
--- a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.spice
+++ b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__dlclkp_1 CLK GATE VGND VNB VPB VPWR GCLK
-M1000 a_261_392# GATE VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=1.77765e+12p ps=1.19e+07u
-M1001 a_477_124# a_309_338# a_83_260# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.692e+11p ps=2.3e+06u
-M1002 VGND CLK a_315_54# VNB nlowvt w=740000u l=150000u
-+  ad=1.19302e+12p pd=9.54e+06u as=2.183e+11p ps=2.07e+06u
-M1003 a_83_260# a_309_338# a_261_392# VPB pshort w=1e+06u l=180000u
-+  ad=3.676e+11p pd=3.06e+06u as=0p ps=0u
-M1004 a_309_338# a_315_54# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1005 GCLK a_990_393# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1006 VPWR a_83_260# a_27_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1007 a_487_508# a_315_54# a_83_260# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1008 VPWR CLK a_315_54# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1009 a_990_393# a_27_74# a_984_125# VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=1.536e+11p ps=1.76e+06u
-M1010 VPWR a_27_74# a_487_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_27_74# a_990_393# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1012 a_984_125# CLK VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 GCLK a_990_393# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1014 a_309_338# a_315_54# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1015 a_990_393# CLK VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_27_74# a_477_124# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_83_260# a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1018 a_267_80# GATE VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1019 a_83_260# a_315_54# a_267_80# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR GATE a_261_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_261_392# a_309_338# a_83_260# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VPWR CLK a_990_393# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 VPWR a_315_54# a_309_338# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X4 a_267_80# a_315_54# a_83_260# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 VGND CLK a_984_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 a_477_124# a_27_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 VGND GATE a_267_80# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 VPWR a_990_393# GCLK VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VGND a_315_54# a_309_338# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_27_74# a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_984_125# a_27_74# a_990_393# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 a_83_260# a_309_338# a_477_124# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X13 a_83_260# a_315_54# a_487_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X14 a_990_393# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X15 a_315_54# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X16 a_487_508# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X17 a_27_74# a_83_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 VGND a_990_393# GCLK VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_315_54# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.cdl b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.cdl
index c15c09f..859d74c 100644
--- a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.cdl
+++ b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_ms__dlclkp_2 CLK GATE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net39 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net51 CLK VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net51 m1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 m1 M0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net58 GATE VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI662 net39 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 GCLK net51 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net82 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net95 CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net51 m1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net103 GATE VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI664 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI659 net51 CLK VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net51 m1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 GCLK net51 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI19 m1 M0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net58 GATE VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 GCLK net51 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net82 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net95 CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net51 m1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 net103 GATE VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net51 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__dlclkp_2
diff --git a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.netlist.tsv b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.netlist.tsv
index d83b6a5..5231d6b 100644
--- a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.netlist.tsv
+++ b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_ms__dlclkp_2	CLK:I GATE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI662	MOSFET	net39	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkpos	net39	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net51	CLK	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net51	m1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	M0	clkneg	net58	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net58	GATE	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net51	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkneg	net82	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net82	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	M0	clkpos	net103	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net95	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net51	m1	net95	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net103	GATE	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net51	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net39	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkpos	net39	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net51	CLK	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net51	m1	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	M0	clkneg	net58	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net58	GATE	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	GCLK	net51	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkneg	net82	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net82	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	M0	clkpos	net103	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net95	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net51	m1	net95	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net103	GATE	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net51	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.spice b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.spice
index 77deae6..08d669c 100644
--- a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.spice
+++ b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ms__dlclkp_2 CLK GATE VGND VNB VPB VPWR GCLK
-M1000 a_83_244# a_315_338# a_267_392# VPB pshort w=1e+06u l=180000u
-+  ad=4.054e+11p pd=3.24e+06u as=2.4e+11p ps=2.48e+06u
-M1001 a_1044_387# CLK VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.95e+11p pd=2.59e+06u as=2.5157e+12p ps=1.567e+07u
-M1002 a_511_508# a_315_48# a_83_244# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1003 GCLK a_1044_387# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=1.45355e+12p ps=1.19e+07u
-M1004 VPWR a_83_244# a_27_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1005 VPWR a_27_74# a_1044_387# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_27_74# a_511_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_494_118# a_315_338# a_83_244# VNB nlowvt w=420000u l=150000u
-+  ad=1.54875e+11p pd=1.7e+06u as=3.049e+11p ps=2.47e+06u
-M1008 a_315_338# a_315_48# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1009 VGND a_1044_387# GCLK VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_27_74# a_494_118# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_315_338# a_315_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1012 VPWR CLK a_315_48# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.52e+11p ps=2.28e+06u
-M1013 a_83_244# a_315_48# a_267_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1014 a_267_74# GATE VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND CLK a_315_48# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1016 GCLK a_1044_387# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1017 a_1044_387# a_27_74# a_1044_119# VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.554e+11p ps=1.9e+06u
-M1018 VPWR a_1044_387# GCLK VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1044_119# CLK VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_267_392# GATE VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_83_244# a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
+X0 VPWR CLK a_1044_387# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_1044_387# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VPWR a_1044_387# GCLK VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_1044_119# a_27_74# a_1044_387# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR GATE a_267_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_83_244# a_315_48# a_511_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X6 a_267_392# a_315_338# a_83_244# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_511_508# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X8 a_27_74# a_83_244# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_494_118# a_27_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 VGND a_1044_387# GCLK VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 GCLK a_1044_387# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_83_244# a_315_338# a_494_118# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X13 VGND CLK a_1044_119# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_315_48# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_267_74# a_315_48# a_83_244# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X16 VGND a_315_48# a_315_338# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 GCLK a_1044_387# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_315_48# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X19 VGND GATE a_267_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X20 a_27_74# a_83_244# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 VPWR a_315_48# a_315_338# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
 .ends
diff --git a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.cdl b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.cdl
index 1e9292f..3651e2f 100644
--- a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.cdl
+++ b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_ms__dlclkp_4 CLK GATE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net39 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net51 CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net51 m1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 m1 M0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net58 GATE VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI662 net39 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 GCLK net51 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net82 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net95 CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net51 m1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net103 GATE VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI664 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI659 net51 CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net51 m1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 m1 M0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 GCLK net51 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net58 GATE VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 GCLK net51 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net82 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net95 CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net51 m1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 net103 GATE VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net51 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__dlclkp_4
diff --git a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.netlist.tsv b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.netlist.tsv
index 2828b6f..59da026 100644
--- a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.netlist.tsv
+++ b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_ms__dlclkp_4	CLK:I GATE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI662	MOSFET	net39	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkpos	net39	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net51	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net51	m1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	M0	clkneg	net58	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net58	GATE	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net51	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkneg	net82	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net82	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	M0	clkpos	net103	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net95	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net51	m1	net95	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net103	GATE	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net51	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net39	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkpos	net39	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net51	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net51	m1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	M0	clkneg	net58	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net58	GATE	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	GCLK	net51	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkneg	net82	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net82	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	M0	clkpos	net103	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net95	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net51	m1	net95	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net103	GATE	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net51	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.spice b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.spice
index 44b5602..44f480a 100644
--- a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.spice
+++ b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_ms__dlclkp_4 CLK GATE VGND VNB VPB VPWR GCLK
-M1000 a_84_48# a_334_338# a_286_392# VPB pshort w=1e+06u l=180000u
-+  ad=3.991e+11p pd=3.21e+06u as=2.4e+11p ps=2.48e+06u
-M1001 VGND a_27_74# a_491_124# VNB nlowvt w=420000u l=150000u
-+  ad=1.78525e+12p pd=1.468e+07u as=2.3775e+11p ps=2.39e+06u
-M1002 VPWR a_27_74# a_527_508# VPB pshort w=420000u l=180000u
-+  ad=3.0253e+12p pd=1.906e+07u as=1.008e+11p ps=1.32e+06u
-M1003 VPWR a_84_48# a_27_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1004 GCLK a_1047_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.216e+11p pd=5.59e+06u as=0p ps=0u
-M1005 a_1047_74# CLK VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1006 GCLK a_1047_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1007 GCLK a_1047_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1047_368# CLK VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.416e+11p pd=2.85e+06u as=0p ps=0u
-M1009 VGND a_1047_368# GCLK VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_1047_368# GCLK VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_491_124# a_334_338# a_84_48# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.587e+11p ps=2.25e+06u
-M1012 VPWR CLK a_334_54# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1013 VGND a_1047_368# GCLK VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_27_74# a_1047_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_334_338# a_334_54# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1016 GCLK a_1047_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_286_80# GATE VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1018 a_84_48# a_334_54# a_286_80# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND CLK a_334_54# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.333e+11p ps=2.19e+06u
-M1020 VGND a_84_48# a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1021 a_1047_368# a_27_74# a_1047_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1022 VPWR a_1047_368# GCLK VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_286_392# GATE VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_527_508# a_334_54# a_84_48# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_334_338# a_334_54# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.675e+11p pd=2.66e+06u as=0p ps=0u
+X0 VPWR CLK a_1047_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_1047_74# a_27_74# a_1047_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_286_392# a_334_338# a_84_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 GCLK a_1047_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_334_54# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VGND a_1047_368# GCLK VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_1047_368# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VPWR a_334_54# a_334_338# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X8 GCLK a_1047_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_334_54# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X10 VGND CLK a_1047_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 GCLK a_1047_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 GCLK a_1047_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VGND a_1047_368# GCLK VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_84_48# a_334_54# a_527_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X15 a_286_80# a_334_54# a_84_48# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X16 VPWR a_1047_368# GCLK VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VGND a_334_54# a_334_338# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 VGND GATE a_286_80# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X19 a_527_508# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X20 a_27_74# a_84_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 VPWR a_1047_368# GCLK VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_491_124# a_27_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X23 a_27_74# a_84_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 VPWR GATE a_286_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X25 a_84_48# a_334_338# a_491_124# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.cdl b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.cdl
index 6ac220c..9032161 100644
--- a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.cdl
+++ b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_ms__dlrbn_1 D GATE_N RESET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI635 clkneg clkpos VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 Q_N net105 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net105 m1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI648 Q_N net105 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net73 db VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net77 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkpos GATE_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI646 net105 m1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 Q_N net105 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 net105 m1 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net120 RESET_B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net112 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net73 db VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 net77 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net132 db VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI638 db D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net105 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 net105 m1 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net120 RESET_B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net112 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net132 db VNB nfet_01v8_lvt m=1 w=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_ms__dlrbn_1
diff --git a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.netlist.tsv b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.netlist.tsv
index ecdc57b..580b940 100644
--- a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.netlist.tsv
+++ b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_ms__dlrbn_1	D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net105	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net73	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net105	m1	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net73	db	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net77	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net77	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net105	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net105	m1	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net120	RESET_B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net112	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net112	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net120	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net132	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net132	db	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net105	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net73	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net105	m1	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net73	db	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net77	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net77	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net105	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net105	m1	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net120	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net112	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net112	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net120	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net132	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net132	db	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.spice b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.spice
index 49fbfd4..669b23c 100644
--- a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.spice
+++ b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__dlrbn_1 D GATE_N RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 VPWR RESET_B a_889_92# VPB pshort w=1.12e+06u l=180000u
-+  ad=2.18775e+12p pd=1.595e+07u as=3.136e+11p ps=2.8e+06u
-M1001 a_608_74# a_27_424# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.4043e+12p ps=1.104e+07u
-M1002 a_686_74# a_231_74# a_608_74# VNB nlowvt w=640000u l=150000u
-+  ad=3.835e+11p pd=2.53e+06u as=0p ps=0u
-M1003 a_231_74# GATE_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1004 a_805_508# a_231_74# a_686_74# VPB pshort w=420000u l=180000u
-+  ad=2.121e+11p pd=1.85e+06u as=3.115e+11p ps=2.71e+06u
-M1005 VGND RESET_B a_1133_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1006 a_686_74# a_373_74# a_614_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1007 a_231_74# GATE_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1008 VGND D a_27_424# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1009 Q_N a_1437_112# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1010 VGND a_889_92# a_1437_112# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.925e+11p ps=1.8e+06u
-M1011 VPWR a_889_92# a_805_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR D a_27_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1013 a_889_92# a_686_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_841_118# a_373_74# a_686_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1015 VGND a_231_74# a_373_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1016 Q a_889_92# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1017 a_1133_74# a_686_74# a_889_92# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1018 Q a_889_92# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1019 a_614_392# a_27_424# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Q_N a_1437_112# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1021 VPWR a_889_92# a_1437_112# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.184e+11p ps=2.2e+06u
-M1022 VPWR a_231_74# a_373_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=3.704e+11p ps=2.85e+06u
-M1023 VGND a_889_92# a_841_118# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_686_74# a_889_92# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VGND a_889_92# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VPWR a_1437_112# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_614_392# a_373_74# a_686_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VPWR GATE_N a_231_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 a_889_92# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VPWR a_889_92# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_608_74# a_231_74# a_686_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_1133_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VGND a_27_424# a_608_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_27_424# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X11 a_373_74# a_231_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_841_118# a_889_92# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X13 VPWR a_27_424# a_614_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 VGND GATE_N a_231_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_1437_112# a_889_92# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X16 a_805_508# a_889_92# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X17 a_686_74# a_373_74# a_841_118# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X18 a_373_74# a_231_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X19 a_686_74# a_231_74# a_805_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X20 a_27_424# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X21 a_889_92# a_686_74# a_1133_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 a_1437_112# a_889_92# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X23 VGND a_1437_112# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.cdl b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.cdl
index 6af773a..2d8552e 100644
--- a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.cdl
+++ b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_ms__dlrbn_2 D GATE_N RESET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI635 clkneg clkpos VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 Q_N net105 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net105 m1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI648 Q_N net105 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net73 db VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net77 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkpos GATE_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI646 net105 m1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 Q_N net105 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 net105 m1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net120 RESET_B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net112 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net73 db VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 net77 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net132 db VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI638 db D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net105 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 net105 m1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net120 RESET_B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net112 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net132 db VNB nfet_01v8_lvt m=1 w=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_ms__dlrbn_2
diff --git a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.netlist.tsv b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.netlist.tsv
index 450a893..7e37590 100644
--- a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.netlist.tsv
+++ b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_ms__dlrbn_2	D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net105	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net73	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net105	m1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net73	db	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net77	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net77	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net105	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net105	m1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net120	RESET_B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net112	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net112	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net120	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net132	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net132	db	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net105	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net73	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net105	m1	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net73	db	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net77	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net77	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net105	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net105	m1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net120	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net112	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net112	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net120	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net132	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net132	db	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.spice b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.spice
index dcaa0c8..28d3ec5 100644
--- a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.spice
+++ b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__dlrbn_2 D GATE_N RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 VPWR a_838_48# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=2.6628e+12p pd=2.07e+07u as=3.024e+11p ps=2.78e+06u
-M1001 a_1066_74# a_670_74# a_838_48# VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=2.109e+11p ps=2.05e+06u
-M1002 VGND RESET_B a_1066_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.80345e+12p pd=1.499e+07u as=0p ps=0u
-M1003 Q a_838_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1004 VPWR a_838_48# a_786_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.869e+11p ps=1.73e+06u
-M1005 VPWR a_230_74# a_363_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=3.704e+11p ps=2.85e+06u
-M1006 a_592_74# a_27_112# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1007 a_670_74# a_230_74# a_592_74# VNB nlowvt w=640000u l=150000u
-+  ad=2.44e+11p pd=2.18e+06u as=0p ps=0u
-M1008 Q_N a_1448_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1009 a_598_392# a_27_112# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.1e+11p pd=2.42e+06u as=0p ps=0u
-M1010 VPWR a_1448_74# Q_N VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_838_48# a_670_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1012 VPWR D a_27_112# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1013 a_230_74# GATE_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1014 a_786_508# a_230_74# a_670_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=3.265e+11p ps=2.74e+06u
-M1015 a_230_74# GATE_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1016 VGND D a_27_112# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1017 a_790_74# a_363_74# a_670_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1018 a_1448_74# a_838_48# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1019 VGND a_838_48# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_1448_74# Q_N VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.368e+11p ps=2.12e+06u
-M1021 a_1448_74# a_838_48# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1022 VGND a_230_74# a_363_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1023 VGND a_838_48# a_790_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_670_74# a_363_74# a_598_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Q a_838_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR RESET_B a_838_48# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Q_N a_1448_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_27_112# a_592_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 Q_N a_1448_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VPWR GATE_N a_230_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 a_598_392# a_363_74# a_670_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VGND a_1448_74# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_786_508# a_838_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X6 a_363_74# a_230_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VGND a_838_48# a_1448_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_27_112# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 a_790_74# a_838_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 Q a_838_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VPWR a_838_48# a_1448_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 VPWR a_1448_74# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_363_74# a_230_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X14 VPWR a_670_74# a_838_48# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_1066_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 Q a_838_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_27_112# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X18 a_838_48# a_670_74# a_1066_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_670_74# a_230_74# a_786_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X20 VGND a_838_48# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 VGND GATE_N a_230_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 a_838_48# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 Q_N a_1448_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_670_74# a_363_74# a_790_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X25 VPWR a_27_112# a_598_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X26 VPWR a_838_48# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 a_592_74# a_230_74# a_670_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.cdl b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.cdl
index 9a2361e..645c6cc 100644
--- a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.cdl
+++ b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_ms__dlrbp_1 D GATE RESET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI635 clkpos clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 Q_N net105 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net105 m1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkneg GATE VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI648 Q_N net105 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net73 db VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net77 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkneg GATE VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI646 net105 m1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 Q_N net105 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 net105 m1 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net120 RESET_B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net112 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net73 db VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 net77 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net132 db VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI638 db D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net105 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 net105 m1 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net120 RESET_B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net112 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net132 db VNB nfet_01v8_lvt m=1 w=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_ms__dlrbp_1
diff --git a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.netlist.tsv b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.netlist.tsv
index 06c07c8..03dbfe3 100644
--- a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.netlist.tsv
+++ b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_ms__dlrbp_1	D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net105	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net73	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net105	m1	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net73	db	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net77	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net77	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net105	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net105	m1	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net120	RESET_B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net112	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net112	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net120	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net132	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net132	db	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net105	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net73	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net105	m1	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net73	db	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net77	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net77	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net105	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net105	m1	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net120	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net112	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net112	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net120	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net132	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net132	db	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.spice b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.spice
index 9e0b785..98828ca 100644
--- a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.spice
+++ b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__dlrbp_1 D GATE RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 Q a_823_98# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.30975e+12p ps=1.109e+07u
-M1001 a_643_80# a_226_104# a_567_392# VPB pshort w=1e+06u l=180000u
-+  ad=3.315e+11p pd=2.75e+06u as=2.1e+11p ps=2.42e+06u
-M1002 VGND D a_27_142# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1003 VGND a_226_104# a_353_98# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.59e+11p ps=2.18e+06u
-M1004 VPWR a_823_98# a_1342_74# VPB pshort w=840000u l=180000u
-+  ad=1.9237e+12p pd=1.499e+07u as=2.352e+11p ps=2.24e+06u
-M1005 VPWR a_823_98# a_756_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.995e+11p ps=1.79e+06u
-M1006 VGND a_823_98# a_775_124# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 a_571_80# a_27_142# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1008 a_643_80# a_353_98# a_571_80# VNB nlowvt w=640000u l=150000u
-+  ad=2.692e+11p pd=2.3e+06u as=0p ps=0u
-M1009 a_823_98# a_643_80# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1010 VGND a_823_98# a_1342_74# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1011 VPWR a_226_104# a_353_98# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1012 a_226_104# GATE VPWR VPB pshort w=840000u l=180000u
-+  ad=2.94e+11p pd=2.38e+06u as=0p ps=0u
-M1013 VPWR RESET_B a_823_98# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Q a_823_98# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1015 a_775_124# a_226_104# a_643_80# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_226_104# GATE VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.701e+11p pd=2.21e+06u as=0p ps=0u
-M1017 VGND RESET_B a_1051_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1018 Q_N a_1342_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1019 a_756_508# a_353_98# a_643_80# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1051_74# a_643_80# a_823_98# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1021 a_567_392# a_27_142# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Q_N a_1342_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.738e+11p pd=2.22e+06u as=0p ps=0u
-M1023 VPWR D a_27_142# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
+X0 VPWR a_27_142# a_567_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VPWR GATE a_226_104# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 a_823_98# a_643_80# a_1051_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR a_643_80# a_823_98# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_643_80# a_226_104# a_775_124# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 a_823_98# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_1342_74# a_823_98# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 VGND a_27_142# a_571_80# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 VGND GATE a_226_104# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_1051_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_353_98# a_226_104# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_27_142# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X12 VPWR a_823_98# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_643_80# a_353_98# a_756_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X14 a_756_508# a_823_98# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X15 VPWR a_1342_74# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VGND a_823_98# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_567_392# a_226_104# a_643_80# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 a_27_142# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X19 a_353_98# a_226_104# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X20 a_1342_74# a_823_98# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X21 a_571_80# a_353_98# a_643_80# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X22 a_775_124# a_823_98# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X23 VGND a_1342_74# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.cdl b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.cdl
index f983d08..57d2f7d 100644
--- a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.cdl
+++ b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_ms__dlrbp_2 D GATE RESET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI635 clkpos clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 Q_N net105 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net105 m1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkneg GATE VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI648 Q_N net105 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net73 db VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net77 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkneg GATE VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI646 net105 m1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 Q_N net105 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 net105 m1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net120 RESET_B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net112 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net73 db VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 net77 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net132 db VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI638 db D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net105 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 net105 m1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net120 RESET_B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net112 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net132 db VNB nfet_01v8_lvt m=1 w=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_ms__dlrbp_2
diff --git a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.netlist.tsv b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.netlist.tsv
index fbf8a24..6b0b4c8 100644
--- a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.netlist.tsv
+++ b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_ms__dlrbp_2	D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net105	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net73	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net105	m1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net73	db	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net77	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net77	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net105	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net105	m1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net120	RESET_B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net112	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net112	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net120	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net132	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net132	db	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net105	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net73	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net105	m1	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net73	db	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net77	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net77	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net105	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net105	m1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net120	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net112	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net112	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net120	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net132	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net132	db	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.spice b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.spice
index c4f7864..6d2519f 100644
--- a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.spice
+++ b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__dlrbp_2 D GATE RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 VPWR D a_27_112# VPB pshort w=840000u l=180000u
-+  ad=2.6463e+12p pd=2.068e+07u as=2.352e+11p ps=2.24e+06u
-M1001 VPWR a_230_74# a_363_82# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1002 VGND a_230_74# a_363_82# VNB nlowvt w=740000u l=150000u
-+  ad=1.8561e+12p pd=1.54e+07u as=2.109e+11p ps=2.05e+06u
-M1003 a_773_124# a_230_74# a_641_80# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.692e+11p ps=2.3e+06u
-M1004 a_569_80# a_27_112# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1005 Q_N a_1449_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1006 VGND a_821_98# a_1449_368# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1007 VPWR a_821_98# a_760_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.995e+11p ps=1.79e+06u
-M1008 VPWR a_1449_368# Q_N VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND RESET_B a_1049_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1010 a_569_392# a_27_112# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1011 Q_N a_1449_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1012 VPWR a_821_98# a_1449_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1013 a_230_74# GATE VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1014 a_641_80# a_230_74# a_569_392# VPB pshort w=1e+06u l=180000u
-+  ad=3.115e+11p pd=2.71e+06u as=0p ps=0u
-M1015 VGND D a_27_112# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1016 a_1049_74# a_641_80# a_821_98# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1017 a_230_74# GATE VPWR VPB pshort w=840000u l=180000u
-+  ad=2.772e+11p pd=2.34e+06u as=0p ps=0u
-M1018 VGND a_821_98# a_773_124# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_1449_368# Q_N VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_760_508# a_363_82# a_641_80# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Q a_821_98# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1022 VPWR a_821_98# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_641_80# a_363_82# a_569_80# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Q a_821_98# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1025 VGND a_821_98# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR RESET_B a_821_98# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.584e+11p ps=2.88e+06u
-M1027 a_821_98# a_641_80# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_363_82# a_230_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 VPWR a_821_98# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Q_N a_1449_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_569_80# a_363_82# a_641_80# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 Q a_821_98# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_821_98# a_641_80# a_1049_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VGND a_821_98# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR a_641_80# a_821_98# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_641_80# a_230_74# a_773_124# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 VPWR GATE a_230_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X10 a_363_82# a_230_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_821_98# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 VGND a_27_112# a_569_80# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 VGND a_1449_368# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VPWR a_1449_368# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_1449_368# a_821_98# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X16 Q a_821_98# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_27_112# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X18 a_1449_368# a_821_98# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X19 VPWR a_27_112# a_569_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X20 VGND GATE a_230_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 Q_N a_1449_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 a_1049_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_569_392# a_230_74# a_641_80# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X24 a_773_124# a_821_98# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X25 a_641_80# a_363_82# a_760_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X26 a_27_112# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X27 a_760_508# a_821_98# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
 .ends
diff --git a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.cdl b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.cdl
index 7b1c16a..6d4e363 100644
--- a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.cdl
+++ b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_ms__dlrtn_1 D GATE_N RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net58 db VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net62 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkpos GATE_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net58 db VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net86 RESET_B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 net62 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net89 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI651 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 m1 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI638 db D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net109 db VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net86 RESET_B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net89 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net109 db VNB nfet_01v8_lvt m=1 w=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_ms__dlrtn_1
diff --git a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.netlist.tsv b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.netlist.tsv
index f49c0f0..e23d71a 100644
--- a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.netlist.tsv
+++ b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_ms__dlrtn_1	D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net58	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net58	db	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net62	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net62	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net86	RESET_B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net89	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net89	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net86	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net109	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net109	db	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net58	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net58	db	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net62	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net62	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net86	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net89	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net89	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net86	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net109	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net109	db	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.spice b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.spice
index 3e6b4cd..dc6edaf 100644
--- a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.spice
+++ b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__dlrtn_1 D GATE_N RESET_B VGND VNB VPB VPWR Q
-M1000 a_232_98# GATE_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=1.64835e+12p ps=1.063e+07u
-M1001 VGND a_897_406# a_854_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1002 Q a_897_406# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=1.70685e+12p ps=1.247e+07u
-M1003 a_854_74# a_357_392# a_657_392# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.915e+11p ps=1.93e+06u
-M1004 a_573_392# a_27_136# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1005 a_232_98# GATE_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1006 a_796_508# a_232_98# a_657_392# VPB pshort w=420000u l=180000u
-+  ad=2.121e+11p pd=1.85e+06u as=3.816e+11p ps=3.03e+06u
-M1007 VPWR a_897_406# a_796_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND RESET_B a_1139_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1009 VPWR a_232_98# a_357_392# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1010 a_681_74# a_27_136# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1011 VPWR RESET_B a_897_406# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=4.4e+11p ps=2.88e+06u
-M1012 VPWR D a_27_136# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1013 VGND D a_27_136# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1014 a_1139_74# a_657_392# a_897_406# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1015 Q a_897_406# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.701e+11p pd=2.21e+06u as=0p ps=0u
-M1016 VGND a_232_98# a_357_392# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1017 a_657_392# a_232_98# a_681_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_657_392# a_357_392# a_573_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_897_406# a_657_392# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND GATE_N a_232_98# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VPWR GATE_N a_232_98# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 a_357_392# a_232_98# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 a_897_406# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_27_136# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X5 a_796_508# a_897_406# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X6 VPWR a_897_406# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_657_392# a_232_98# a_796_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X8 a_357_392# a_232_98# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_681_74# a_232_98# a_657_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_1139_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_573_392# a_357_392# a_657_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 a_27_136# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X13 a_897_406# a_657_392# a_1139_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VPWR a_657_392# a_897_406# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X15 VGND a_27_136# a_681_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X16 a_657_392# a_357_392# a_854_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X17 VPWR a_27_136# a_573_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 a_854_74# a_897_406# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X19 VGND a_897_406# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.cdl b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.cdl
index c3199b6..52b82a3 100644
--- a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.cdl
+++ b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_ms__dlrtn_2 D GATE_N RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net58 db VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net62 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkpos GATE_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net58 db VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net97 RESET_B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 net62 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net89 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI651 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 m1 M0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI638 db D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net109 db VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net97 RESET_B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net89 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net109 db VNB nfet_01v8_lvt m=1 w=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_ms__dlrtn_2
diff --git a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.netlist.tsv b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.netlist.tsv
index 1e36cd7..1155ca8 100644
--- a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.netlist.tsv
+++ b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_ms__dlrtn_2	D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net58	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net58	db	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net62	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net62	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net97	RESET_B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net89	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net89	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net97	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net109	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net109	db	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net58	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net58	db	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net62	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net62	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net97	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net89	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net89	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net97	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net109	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net109	db	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.spice b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.spice
index 84f0b61..7786cab 100644
--- a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.spice
+++ b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ms__dlrtn_2 D GATE_N RESET_B VGND VNB VPB VPWR Q
-M1000 VGND RESET_B a_1153_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.30995e+12p pd=1.387e+07u as=1.776e+11p ps=1.96e+06u
-M1001 a_232_98# GATE_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.257e+11p pd=2.09e+06u as=0p ps=0u
-M1002 a_1153_74# a_673_392# a_913_406# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1003 a_589_392# a_27_136# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=2.6589e+12p ps=1.646e+07u
-M1004 Q a_913_406# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1005 VPWR a_913_406# a_781_504# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=2.772e+11p ps=2.16e+06u
-M1006 Q a_913_406# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1007 VGND a_232_98# a_373_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.294e+11p ps=2.1e+06u
-M1008 a_913_406# a_673_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1009 VPWR a_913_406# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_673_392# a_373_82# a_589_392# VPB pshort w=1e+06u l=180000u
-+  ad=3.158e+11p pd=2.72e+06u as=0p ps=0u
-M1011 a_232_98# GATE_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1012 a_781_504# a_232_98# a_673_392# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_913_406# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_673_392# a_232_98# a_697_74# VNB nlowvt w=640000u l=150000u
-+  ad=1.915e+11p pd=1.93e+06u as=1.536e+11p ps=1.76e+06u
-M1015 VPWR D a_27_136# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1016 a_697_74# a_27_136# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND D a_27_136# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1018 VGND a_913_406# a_870_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1019 VPWR RESET_B a_913_406# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_870_74# a_373_82# a_673_392# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_232_98# a_373_82# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
+X0 VGND GATE_N a_232_98# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VPWR a_27_136# a_589_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_673_392# a_232_98# a_781_504# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X3 a_697_74# a_232_98# a_673_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_589_392# a_373_82# a_673_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 VGND a_27_136# a_697_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 a_27_136# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X7 VPWR a_673_392# a_913_406# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_913_406# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 Q a_913_406# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_673_392# a_373_82# a_870_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X11 a_870_74# a_913_406# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X12 VPWR GATE_N a_232_98# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X13 VGND a_913_406# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_373_82# a_232_98# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X15 a_1153_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_27_136# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X17 a_913_406# a_673_392# a_1153_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_373_82# a_232_98# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 VPWR a_913_406# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 Q a_913_406# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 a_781_504# a_913_406# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
 .ends
diff --git a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.cdl b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.cdl
index f1021a8..67c2545 100644
--- a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.cdl
+++ b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_ms__dlrtn_4 D GATE_N RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net59 db VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net63 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkpos GATE_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net59 db VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net87 RESET_B VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MI653 net63 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net90 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI651 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 m1 M0 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI638 db D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net110 db VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net87 RESET_B VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net90 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net110 db VNB nfet_01v8_lvt m=1 w=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_ms__dlrtn_4
diff --git a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.netlist.tsv b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.netlist.tsv
index 75c304d..b8b1c3b 100644
--- a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.netlist.tsv
+++ b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_ms__dlrtn_4	D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net59	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net59	db	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net63	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net63	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net87	RESET_B	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net90	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net90	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net87	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net110	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net110	db	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net59	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net59	db	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net63	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net63	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net87	RESET_B	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net90	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net90	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net87	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net110	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net110	db	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.spice b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.spice
index 504d233..0b4bfd5 100644
--- a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.spice
+++ b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_ms__dlrtn_4 D GATE_N RESET_B VGND VNB VPB VPWR Q
-M1000 a_750_504# a_232_98# a_642_392# VPB pshort w=420000u l=180000u
-+  ad=2.898e+11p pd=2.22e+06u as=3.158e+11p ps=2.72e+06u
-M1001 VGND a_888_406# Q VNB nlowvt w=740000u l=150000u
-+  ad=2.1144e+12p pd=1.632e+07u as=4.144e+11p ps=4.08e+06u
-M1002 a_1035_74# RESET_B VGND VNB nlowvt w=640000u l=150000u
-+  ad=5.44e+11p pd=5.54e+06u as=0p ps=0u
-M1003 a_232_98# GATE_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=0p ps=0u
-M1004 VGND a_888_406# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_564_392# a_27_136# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.1e+11p pd=2.42e+06u as=2.5597e+12p ps=1.989e+07u
-M1006 a_839_74# a_348_392# a_642_392# VNB nlowvt w=420000u l=150000u
-+  ad=1.155e+11p pd=1.39e+06u as=1.915e+11p ps=1.93e+06u
-M1007 a_232_98# GATE_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1008 VPWR a_232_98# a_348_392# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1009 a_1035_74# a_642_392# a_888_406# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1010 VPWR a_888_406# a_750_504# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Q a_888_406# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_888_406# a_642_392# VPWR VPB pshort w=840000u l=180000u
-+  ad=5.124e+11p pd=4.58e+06u as=0p ps=0u
-M1013 VPWR D a_27_136# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1014 a_888_406# RESET_B VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_888_406# a_839_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_642_392# a_888_406# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_642_392# a_232_98# a_666_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1018 a_666_74# a_27_136# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_888_406# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=7.168e+11p ps=5.76e+06u
-M1020 VGND a_232_98# a_348_392# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1021 VGND RESET_B a_1035_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Q a_888_406# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Q a_888_406# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND D a_27_136# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1025 Q a_888_406# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_888_406# a_642_392# a_1035_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_888_406# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_642_392# a_348_392# a_564_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR RESET_B a_888_406# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND GATE_N a_232_98# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 Q a_888_406# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VPWR a_27_136# a_564_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 a_666_74# a_232_98# a_642_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 VPWR a_888_406# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VGND a_27_136# a_666_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 a_642_392# a_348_392# a_839_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 a_27_136# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X8 a_839_74# a_888_406# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 a_348_392# a_232_98# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X10 a_642_392# a_232_98# a_750_504# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X11 VGND a_888_406# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_564_392# a_348_392# a_642_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 a_888_406# a_642_392# a_1035_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 VPWR a_888_406# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_1035_74# a_642_392# a_888_406# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X16 a_750_504# a_888_406# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X17 a_888_406# a_642_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X18 Q a_888_406# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_1035_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X20 Q a_888_406# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 VPWR RESET_B a_888_406# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X22 a_888_406# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X23 a_27_136# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X24 VPWR GATE_N a_232_98# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X25 VGND a_888_406# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 a_348_392# a_232_98# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 VGND RESET_B a_1035_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X28 VPWR a_642_392# a_888_406# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X29 Q a_888_406# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.cdl b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.cdl
index afa562e..13535cc 100644
--- a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.cdl
+++ b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_ms__dlrtp_1 D GATE RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkpos clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkneg GATE VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI633 clkneg GATE VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net58 db VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net62 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkneg GATE VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net58 db VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net86 RESET_B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 net62 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net89 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI651 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 m1 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI638 db D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net109 db VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net86 RESET_B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net89 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net109 db VNB nfet_01v8_lvt m=1 w=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_ms__dlrtp_1
diff --git a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.netlist.tsv b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.netlist.tsv
index a060d26..2dd8dd3 100644
--- a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.netlist.tsv
+++ b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_ms__dlrtp_1	D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net58	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net58	db	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net62	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net62	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net86	RESET_B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net89	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net89	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net86	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net109	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net109	db	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net58	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net58	db	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net62	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net62	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net86	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net89	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net89	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net86	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net109	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net109	db	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.spice b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.spice
index 3e78198..207dc9f 100644
--- a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.spice
+++ b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__dlrtp_1 D GATE RESET_B VGND VNB VPB VPWR Q
-M1000 a_643_74# a_219_424# a_571_392# VPB pshort w=1e+06u l=180000u
-+  ad=3.115e+11p pd=2.71e+06u as=2.4e+11p ps=2.48e+06u
-M1001 VPWR a_219_424# a_363_74# VPB pshort w=840000u l=180000u
-+  ad=1.4754e+12p pd=1.132e+07u as=2.352e+11p ps=2.24e+06u
-M1002 VPWR RESET_B a_817_48# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.2e+11p ps=2.64e+06u
-M1003 a_817_48# a_643_74# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Q a_817_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1005 a_762_508# a_363_74# a_643_74# VPB pshort w=420000u l=180000u
-+  ad=1.995e+11p pd=1.79e+06u as=0p ps=0u
-M1006 a_219_424# GATE VPWR VPB pshort w=840000u l=180000u
-+  ad=4.2675e+11p pd=2.84e+06u as=0p ps=0u
-M1007 a_219_424# GATE VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=9.349e+11p ps=8.16e+06u
-M1008 VPWR D a_27_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1009 VGND RESET_B a_1045_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1010 a_769_74# a_219_424# a_643_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.907e+11p ps=2.24e+06u
-M1011 VGND a_817_48# a_769_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_219_424# a_363_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=3.2225e+11p ps=2.64e+06u
-M1013 VPWR a_817_48# a_762_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Q a_817_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1015 a_1045_74# a_643_74# a_817_48# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1016 a_571_392# a_27_424# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND D a_27_424# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1018 a_565_74# a_27_424# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1019 a_643_74# a_363_74# a_565_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_363_74# a_219_424# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 VPWR a_643_74# a_817_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_1045_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR a_27_424# a_571_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VPWR a_817_48# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_817_48# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_27_424# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 a_571_392# a_219_424# a_643_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_565_74# a_363_74# a_643_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_769_74# a_817_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 a_643_74# a_363_74# a_762_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X11 VGND GATE a_219_424# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VGND a_27_424# a_565_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 a_643_74# a_219_424# a_769_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X14 a_762_508# a_817_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X15 a_27_424# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X16 a_817_48# a_643_74# a_1045_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 VPWR GATE a_219_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X18 VGND a_817_48# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_363_74# a_219_424# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.cdl b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.cdl
index 5bc7197..604fbc5 100644
--- a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.cdl
+++ b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_ms__dlrtp_2 D GATE RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkpos clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkneg GATE VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI633 clkneg GATE VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net58 db VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net62 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkneg GATE VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net58 db VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net97 RESET_B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 net62 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net89 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI651 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 m1 M0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI638 db D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net109 db VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net97 RESET_B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net89 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net109 db VNB nfet_01v8_lvt m=1 w=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_ms__dlrtp_2
diff --git a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.netlist.tsv b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.netlist.tsv
index 63eb9d7..ba6fea6 100644
--- a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.netlist.tsv
+++ b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_ms__dlrtp_2	D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net58	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net58	db	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net62	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net62	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net97	RESET_B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net89	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net89	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net97	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net109	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net109	db	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net58	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net58	db	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net62	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net62	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net97	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net89	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net89	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net97	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net109	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net109	db	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.spice b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.spice
index af4d495..4b5ff52 100644
--- a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.spice
+++ b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ms__dlrtp_2 D GATE RESET_B VGND VNB VPB VPWR Q
-M1000 a_759_508# a_347_98# a_646_74# VPB pshort w=420000u l=180000u
-+  ad=2.121e+11p pd=1.85e+06u as=3.115e+11p ps=2.71e+06u
-M1001 VGND a_235_74# a_347_98# VNB nlowvt w=740000u l=150000u
-+  ad=1.38725e+12p pd=1.126e+07u as=2.701e+11p ps=2.21e+06u
-M1002 VPWR D a_27_392# VPB pshort w=840000u l=180000u
-+  ad=2.11845e+12p pd=1.561e+07u as=2.352e+11p ps=2.24e+06u
-M1003 a_568_74# a_27_392# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1004 a_646_74# a_347_98# a_568_74# VNB nlowvt w=640000u l=150000u
-+  ad=3.21575e+11p pd=2.36e+06u as=0p ps=0u
-M1005 VGND RESET_B a_1060_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1006 Q a_832_55# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.146e+11p pd=2.06e+06u as=0p ps=0u
-M1007 VPWR a_235_74# a_347_98# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1008 Q a_832_55# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.192e+11p pd=2.81e+06u as=0p ps=0u
-M1009 a_832_55# a_646_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1010 VPWR RESET_B a_832_55# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_832_55# a_759_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND D a_27_392# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1013 VPWR a_832_55# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_568_392# a_27_392# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1015 a_235_74# GATE VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1016 a_646_74# a_235_74# a_568_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1060_74# a_646_74# a_832_55# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1018 VGND a_832_55# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_784_81# a_235_74# a_646_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1020 VGND a_832_55# a_784_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_235_74# GATE VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
+X0 VGND GATE a_235_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_568_74# a_347_98# a_646_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_646_74# a_347_98# a_759_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X3 Q a_832_55# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VGND a_27_392# a_568_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 VPWR a_832_55# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VGND a_832_55# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 Q a_832_55# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_832_55# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VPWR GATE a_235_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X10 a_347_98# a_235_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X11 a_832_55# a_646_74# a_1060_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_784_81# a_832_55# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X13 a_646_74# a_235_74# a_784_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X14 a_759_508# a_832_55# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X15 VPWR a_646_74# a_832_55# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_27_392# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X17 VPWR a_27_392# a_568_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 a_27_392# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X19 a_347_98# a_235_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_568_392# a_235_74# a_646_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X21 a_1060_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.cdl b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.cdl
index 5257414..c22e9f3 100644
--- a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.cdl
+++ b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_ms__dlrtp_4 D GATE RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkpos clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkneg GATE VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI633 clkneg GATE VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net59 db VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net63 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkneg GATE VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net59 db VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net87 RESET_B VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MI653 net63 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net90 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI651 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 m1 M0 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI638 db D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net110 db VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net87 RESET_B VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net90 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net110 db VNB nfet_01v8_lvt m=1 w=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_ms__dlrtp_4
diff --git a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.netlist.tsv b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.netlist.tsv
index 393fa87..c86c924 100644
--- a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.netlist.tsv
+++ b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_ms__dlrtp_4	D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net59	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net59	db	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net63	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net63	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net87	RESET_B	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net90	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net90	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net87	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net110	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net110	db	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net59	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net59	db	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net63	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net63	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net87	RESET_B	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net90	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net90	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net87	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net110	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net110	db	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.spice b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.spice
index 28fabf3..dae3d5d 100644
--- a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.spice
+++ b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_ms__dlrtp_4 D GATE RESET_B VGND VNB VPB VPWR Q
-M1000 VPWR D a_27_126# VPB pshort w=840000u l=180000u
-+  ad=2.5342e+12p pd=2.013e+07u as=2.352e+11p ps=2.24e+06u
-M1001 a_938_74# a_640_74# a_797_48# VNB nlowvt w=640000u l=150000u
-+  ad=5.44e+11p pd=5.54e+06u as=1.824e+11p ps=1.85e+06u
-M1002 a_559_74# a_27_126# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.632e+11p pd=1.79e+06u as=1.6158e+12p ps=1.463e+07u
-M1003 a_755_74# a_243_394# a_640_74# VNB nlowvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.555e+11p ps=2.13e+06u
-M1004 VPWR a_797_48# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=6.832e+11p ps=5.7e+06u
-M1005 a_243_394# GATE VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1006 VPWR a_243_394# a_364_120# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1007 a_797_48# a_640_74# a_938_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_797_48# a_640_74# VPWR VPB pshort w=840000u l=180000u
-+  ad=4.956e+11p pd=4.54e+06u as=0p ps=0u
-M1009 Q a_797_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1010 Q a_797_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR RESET_B a_797_48# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_640_74# a_797_48# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_797_48# RESET_B VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_797_48# a_750_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.869e+11p ps=1.73e+06u
-M1015 a_640_74# a_243_394# a_565_392# VPB pshort w=1e+06u l=180000u
-+  ad=3.115e+11p pd=2.71e+06u as=2.1e+11p ps=2.42e+06u
-M1016 a_243_394# GATE VPWR VPB pshort w=840000u l=180000u
-+  ad=2.814e+11p pd=2.35e+06u as=0p ps=0u
-M1017 VGND D a_27_126# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1018 VGND RESET_B a_938_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Q a_797_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_797_48# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_243_394# a_364_120# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.294e+11p ps=2.1e+06u
-M1022 Q a_797_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_797_48# a_755_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_797_48# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_750_508# a_364_120# a_640_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_640_74# a_364_120# a_559_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_565_392# a_27_126# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_938_74# RESET_B VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND a_797_48# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_755_74# a_797_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X1 a_565_392# a_243_394# a_640_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_640_74# a_364_120# a_750_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X3 Q a_797_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR GATE a_243_394# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 a_938_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VGND GATE a_243_394# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VGND a_797_48# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_364_120# a_243_394# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 Q a_797_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_797_48# a_640_74# a_938_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 VPWR a_640_74# a_797_48# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X12 VGND a_797_48# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_27_126# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X14 a_797_48# a_640_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X15 VGND RESET_B a_938_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X16 VPWR a_797_48# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 Q a_797_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 Q a_797_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 VPWR RESET_B a_797_48# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X20 a_750_508# a_797_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X21 a_559_74# a_364_120# a_640_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X22 VPWR a_797_48# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_27_126# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X24 VPWR a_27_126# a_565_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X25 a_364_120# a_243_394# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 a_938_74# a_640_74# a_797_48# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X27 VGND a_27_126# a_559_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X28 a_797_48# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X29 a_640_74# a_243_394# a_755_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.cdl b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.cdl
index 6a1005d..7785e99 100644
--- a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.cdl
+++ b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ms__dlxbn_1 D GATE_N VGND VNB VPB VPWR Q Q_N
 *.PININFO D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI635 clkneg clkpos VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 Q_N net96 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net96 m1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI648 Q_N net96 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net64 db VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net68 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkpos GATE_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI646 net96 m1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 Q_N net96 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 net96 m1 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net99 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net64 db VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 net68 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net119 db VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI638 db D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net96 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 net96 m1 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net99 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net119 db VNB nfet_01v8_lvt m=1 w=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_ms__dlxbn_1
diff --git a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.netlist.tsv b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.netlist.tsv
index f75578b..e854261 100644
--- a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.netlist.tsv
+++ b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ms__dlxbn_1	D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net96	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net64	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net96	m1	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net64	db	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net68	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net68	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net96	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net96	m1	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net99	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net99	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net119	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net119	db	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net96	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net64	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net96	m1	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net64	db	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net68	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net68	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net96	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net96	m1	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net99	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net99	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net119	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net119	db	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.spice b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.spice
index a1006e9..573b82e 100644
--- a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.spice
+++ b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ms__dlxbn_1 D GATE_N VGND VNB VPB VPWR Q Q_N
-M1000 VPWR D a_27_120# VPB pshort w=840000u l=180000u
-+  ad=1.6835e+12p pd=1.404e+07u as=2.814e+11p ps=2.35e+06u
-M1001 a_232_82# GATE_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1002 a_574_392# a_27_120# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1003 a_232_82# GATE_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.4754e+12p ps=1.217e+07u
-M1004 VGND a_863_294# a_852_123# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1005 a_863_294# a_653_79# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.183e+11p pd=2.07e+06u as=0p ps=0u
-M1006 a_808_392# a_232_82# a_653_79# VPB pshort w=420000u l=180000u
-+  ad=1.281e+11p pd=1.45e+06u as=3.844e+11p ps=3.14e+06u
-M1007 Q_N a_1350_424# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1008 VGND a_232_82# a_343_80# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=3.182e+11p ps=2.34e+06u
-M1009 VGND a_863_294# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1010 a_852_123# a_343_80# a_653_79# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=4.099e+11p ps=2.97e+06u
-M1011 VPWR a_863_294# a_808_392# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_653_79# a_232_82# a_575_79# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1013 a_575_79# a_27_120# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_653_79# a_343_80# a_574_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_863_294# a_653_79# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.968e+11p pd=2.77e+06u as=0p ps=0u
-M1016 a_1350_424# a_863_294# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1017 a_1350_424# a_863_294# VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1018 Q_N a_1350_424# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1019 VPWR a_863_294# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.968e+11p ps=2.77e+06u
-M1020 VGND D a_27_120# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1021 VPWR a_232_82# a_343_80# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
+X0 Q a_863_294# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_653_79# a_343_80# a_852_123# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 a_808_392# a_863_294# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X3 a_27_120# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X4 VGND a_863_294# a_1350_424# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X5 a_574_392# a_343_80# a_653_79# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 VPWR GATE_N a_232_82# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 VGND GATE_N a_232_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_575_79# a_232_82# a_653_79# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_343_80# a_232_82# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND a_27_120# a_575_79# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 a_27_120# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X12 a_852_123# a_863_294# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X13 a_343_80# a_232_82# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X14 VPWR a_1350_424# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 Q a_863_294# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 VPWR a_27_120# a_574_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X17 VGND a_653_79# a_863_294# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 VPWR a_653_79# a_863_294# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 VPWR a_863_294# a_1350_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X20 a_653_79# a_232_82# a_808_392# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X21 VGND a_1350_424# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.cdl b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.cdl
index 3866b33..d130a7d 100644
--- a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.cdl
+++ b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ms__dlxbn_2 D GATE_N VGND VNB VPB VPWR Q Q_N
 *.PININFO D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI635 clkneg clkpos VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 Q_N net98 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net98 m1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI648 Q_N net98 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net66 db VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net70 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI646 net98 m1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkpos GATE_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 Q_N net98 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net66 db VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 net98 m1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net101 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 net70 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI651 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI638 db D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net121 db VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net98 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 net98 m1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net101 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net121 db VNB nfet_01v8_lvt m=1 w=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_ms__dlxbn_2
diff --git a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.netlist.tsv b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.netlist.tsv
index 24ed96f..aa446b7 100644
--- a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.netlist.tsv
+++ b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ms__dlxbn_2	D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net98	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net66	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net98	m1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net66	db	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net70	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net70	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net98	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net98	m1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net101	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net101	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net121	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net121	db	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net98	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net66	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net98	m1	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net66	db	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net70	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net70	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net98	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net98	m1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net101	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net101	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net121	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net121	db	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.spice b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.spice
index f84b78d..e9236af 100644
--- a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.spice
+++ b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_ms__dlxbn_2 D GATE_N VGND VNB VPB VPWR Q Q_N
-M1000 VPWR a_887_270# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=2.3791e+12p pd=1.953e+07u as=3.024e+11p ps=2.78e+06u
-M1001 a_232_98# GATE_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=2.0325e+12p ps=1.669e+07u
-M1002 Q a_887_270# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1003 Q_N a_1442_94# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1004 VGND a_232_98# a_343_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.817e+11p ps=2.29e+06u
-M1005 VPWR a_1442_94# Q_N VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_817_392# a_232_98# a_647_79# VPB pshort w=420000u l=180000u
-+  ad=1.47e+11p pd=1.54e+06u as=4.159e+11p ps=3.29e+06u
-M1007 Q_N a_1442_94# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1008 VGND a_887_270# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_887_270# a_647_79# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1010 a_1442_94# a_887_270# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1011 a_568_392# a_27_136# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1012 a_569_79# a_27_136# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1013 a_647_79# a_232_98# a_569_79# VNB nlowvt w=640000u l=150000u
-+  ad=3.952e+11p pd=2.9e+06u as=0p ps=0u
-M1014 VGND a_1442_94# Q_N VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_887_270# a_647_79# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1016 a_1442_94# a_887_270# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1017 a_647_79# a_343_74# a_568_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND D a_27_136# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1019 a_232_98# GATE_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1020 VPWR D a_27_136# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=3.066e+11p ps=2.41e+06u
-M1021 VPWR a_887_270# a_817_392# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_887_270# a_839_123# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1023 VPWR a_232_98# a_343_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1024 Q a_887_270# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_839_123# a_343_74# a_647_79# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND GATE_N a_232_98# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 Q_N a_1442_94# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VGND a_27_136# a_569_79# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 VGND a_647_79# a_887_270# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR GATE_N a_232_98# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 a_27_136# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X6 a_343_74# a_232_98# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 Q a_887_270# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 Q a_887_270# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VGND a_1442_94# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND a_887_270# a_1442_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 VPWR a_1442_94# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_343_74# a_232_98# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_839_123# a_887_270# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X14 Q_N a_1442_94# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 VPWR a_887_270# a_1442_94# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 VGND a_887_270# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_27_136# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X18 a_647_79# a_232_98# a_817_392# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X19 VPWR a_647_79# a_887_270# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_647_79# a_343_74# a_839_123# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X21 VPWR a_27_136# a_568_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X22 VPWR a_887_270# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_817_392# a_887_270# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X24 a_568_392# a_343_74# a_647_79# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X25 a_569_79# a_232_98# a_647_79# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.cdl b/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.cdl
index 4f34515..a43aa83 100644
--- a/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.cdl
+++ b/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ms__dlxbp_1 D GATE VGND VNB VPB VPWR Q Q_N
 *.PININFO D:I GATE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI635 clkpos clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 Q_N net98 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net98 m1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkneg GATE VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI648 Q_N net98 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net66 db VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net70 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkneg GATE VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI646 net98 m1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 Q_N net98 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 net98 m1 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net101 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net66 db VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 net70 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net121 db VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI638 db D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net98 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 net98 m1 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net101 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net121 db VNB nfet_01v8_lvt m=1 w=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_ms__dlxbp_1
diff --git a/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.netlist.tsv b/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.netlist.tsv
index c2adec0..4f6199d 100644
--- a/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.netlist.tsv
+++ b/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ms__dlxbp_1	D:I GATE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net98	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net66	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net98	m1	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net66	db	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net70	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net70	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net98	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net98	m1	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net101	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net101	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net121	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net121	db	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net98	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net66	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net98	m1	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net66	db	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net70	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net70	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net98	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net98	m1	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net101	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net101	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net121	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net121	db	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.spice b/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.spice
index 64c1209..c28ff02 100644
--- a/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.spice
+++ b/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ms__dlxbp_1 D GATE VGND VNB VPB VPWR Q Q_N
-M1000 VPWR a_231_74# a_373_82# VPB pshort w=840000u l=180000u
-+  ad=1.95315e+12p pd=1.524e+07u as=2.352e+11p ps=2.24e+06u
-M1001 a_589_392# a_27_413# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.1e+11p pd=2.42e+06u as=0p ps=0u
-M1002 a_231_74# GATE VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.4685e+12p ps=1.184e+07u
-M1003 a_815_124# a_231_74# a_667_80# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.028e+11p ps=2.46e+06u
-M1004 a_863_98# a_667_80# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1005 VGND D a_27_413# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1006 VPWR a_863_98# a_773_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.995e+11p ps=1.79e+06u
-M1007 a_863_98# a_667_80# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1008 Q_N a_1350_116# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1009 Q_N a_1350_116# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1010 VPWR D a_27_413# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.31e+11p ps=2.23e+06u
-M1011 a_667_80# a_373_82# a_589_80# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1012 a_589_80# a_27_413# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_231_74# GATE VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1014 a_1350_116# a_863_98# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.31e+11p pd=2.23e+06u as=0p ps=0u
-M1015 VGND a_863_98# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1016 a_667_80# a_231_74# a_589_392# VPB pshort w=1e+06u l=180000u
-+  ad=3.065e+11p pd=2.7e+06u as=0p ps=0u
-M1017 VPWR a_863_98# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1018 a_1350_116# a_863_98# VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1019 VGND a_231_74# a_373_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1020 VGND a_863_98# a_815_124# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_773_508# a_373_82# a_667_80# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_667_80# a_863_98# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_373_82# a_231_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 VPWR a_27_413# a_589_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 a_773_508# a_863_98# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X4 Q a_863_98# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VPWR GATE a_231_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X6 VGND a_1350_116# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 Q a_863_98# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_589_392# a_231_74# a_667_80# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 VGND a_667_80# a_863_98# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_27_413# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X11 a_373_82# a_231_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_667_80# a_231_74# a_815_124# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X13 a_589_80# a_373_82# a_667_80# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 VPWR a_1350_116# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 VGND a_27_413# a_589_80# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X16 VGND GATE a_231_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 VGND a_863_98# a_1350_116# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X18 a_27_413# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X19 VPWR a_863_98# a_1350_116# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X20 a_667_80# a_373_82# a_773_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X21 a_815_124# a_863_98# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.cdl b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.cdl
index b509fc0..2790010 100644
--- a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.cdl
+++ b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_ms__dlxtn_1 D GATE_N VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net53 db VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI18 net53 db VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net60 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkpos GATE_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 net60 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net80 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI651 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 m1 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI638 db D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net100 db VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net80 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net100 db VNB nfet_01v8_lvt m=1 w=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_ms__dlxtn_1
diff --git a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.netlist.tsv b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.netlist.tsv
index b918f39..604df93 100644
--- a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.netlist.tsv
+++ b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.netlist.tsv
@@ -1,20 +1,20 @@
 sky130_fd_sc_ms__dlxtn_1	D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net53	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net53	db	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net60	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net60	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net80	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net80	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net100	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net100	db	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net53	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net53	db	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net60	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net60	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net80	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net80	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net100	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net100	db	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.spice b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.spice
index 1948d60..d07a4c0 100644
--- a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.spice
+++ b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ms__dlxtn_1 D GATE_N VGND VNB VPB VPWR Q
-M1000 a_815_508# a_220_419# a_672_392# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=4.915e+11p ps=3.07e+06u
-M1001 Q a_863_441# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.146e+11p pd=2.06e+06u as=1.31878e+12p ps=1.016e+07u
-M1002 Q a_863_441# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=1.48785e+12p ps=1.153e+07u
-M1003 VGND a_220_419# a_369_392# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1004 a_588_392# a_27_115# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1005 VGND D a_27_115# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1006 a_863_441# a_672_392# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1007 a_871_139# a_369_392# a_672_392# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.786e+11p ps=2.52e+06u
-M1008 a_672_392# a_369_392# a_588_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_220_419# GATE_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1010 VPWR a_863_441# a_815_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_220_419# GATE_N VPWR VPB pshort w=840000u l=180000u
-+  ad=3.066e+11p pd=2.41e+06u as=0p ps=0u
-M1012 VGND a_863_441# a_871_139# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_863_441# a_672_392# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1014 VPWR D a_27_115# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1015 VPWR a_220_419# a_369_392# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1016 a_655_79# a_27_115# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1017 a_672_392# a_220_419# a_655_79# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_115# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X1 a_672_392# a_369_392# a_871_139# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 VPWR GATE_N a_220_419# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 VPWR a_27_115# a_588_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_655_79# a_220_419# a_672_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_672_392# a_220_419# a_815_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X6 VGND GATE_N a_220_419# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VGND a_27_115# a_655_79# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_588_392# a_369_392# a_672_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 VPWR a_863_441# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_871_139# a_863_441# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X11 a_369_392# a_220_419# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X12 VGND a_672_392# a_863_441# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 VPWR a_672_392# a_863_441# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 a_369_392# a_220_419# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 VGND a_863_441# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_27_115# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X17 a_815_508# a_863_441# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
 .ends
diff --git a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.cdl b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.cdl
index dcb52fc..a03365f 100644
--- a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.cdl
+++ b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_ms__dlxtn_2 D GATE_N VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net51 db VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI18 net51 db VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net55 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkpos GATE_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 net55 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net78 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI651 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 m1 M0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI638 db D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net78 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8_lvt m=1 w=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_ms__dlxtn_2
diff --git a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.netlist.tsv b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.netlist.tsv
index e23ad56..9862326 100644
--- a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.netlist.tsv
+++ b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.netlist.tsv
@@ -1,20 +1,20 @@
 sky130_fd_sc_ms__dlxtn_2	D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net55	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net55	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net78	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net78	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net55	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net55	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net78	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net78	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.spice b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.spice
index 4e13afe..2e5ae56 100644
--- a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.spice
+++ b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__dlxtn_2 D GATE_N VGND VNB VPB VPWR Q
-M1000 Q a_842_405# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.516e+11p pd=2.16e+06u as=1.54015e+12p ps=1.207e+07u
-M1001 VPWR D a_27_120# VPB pshort w=840000u l=180000u
-+  ad=1.89385e+12p pd=1.485e+07u as=2.352e+11p ps=2.24e+06u
-M1002 a_672_392# a_232_82# a_658_79# VNB nlowvt w=640000u l=150000u
-+  ad=2.803e+11p pd=2.53e+06u as=1.536e+11p ps=1.76e+06u
-M1003 a_658_79# a_27_120# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_232_82# GATE_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1005 VPWR a_842_405# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.528e+11p ps=2.87e+06u
-M1006 VGND a_842_405# a_875_139# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 VPWR a_842_405# a_794_503# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1008 VGND a_232_82# a_369_392# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1009 a_588_392# a_27_120# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1010 VGND a_842_405# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_842_405# a_672_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1012 a_672_392# a_369_392# a_588_392# VPB pshort w=1e+06u l=180000u
-+  ad=3.83875e+11p pd=2.86e+06u as=0p ps=0u
-M1013 a_875_139# a_369_392# a_672_392# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_842_405# a_672_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1015 a_794_503# a_232_82# a_672_392# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND D a_27_120# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1017 a_232_82# GATE_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1018 VPWR a_232_82# a_369_392# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1019 Q a_842_405# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_27_120# a_588_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 Q a_842_405# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_672_392# a_369_392# a_875_139# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 a_588_392# a_369_392# a_672_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_794_503# a_842_405# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X5 a_369_392# a_232_82# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X6 VPWR a_672_392# a_842_405# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND GATE_N a_232_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VGND a_672_392# a_842_405# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VGND a_842_405# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 Q a_842_405# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_27_120# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X12 a_369_392# a_232_82# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_672_392# a_232_82# a_794_503# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X14 a_658_79# a_232_82# a_672_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 VPWR GATE_N a_232_82# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X16 a_875_139# a_842_405# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X17 VPWR a_842_405# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 VGND a_27_120# a_658_79# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X19 a_27_120# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
 .ends
diff --git a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.cdl b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.cdl
index be59b4f..2a54525 100644
--- a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.cdl
+++ b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_ms__dlxtn_4 D GATE_N VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net51 db VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI18 net51 db VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net55 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkpos GATE_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 net55 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net78 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI651 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 m1 M0 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI638 db D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net78 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8_lvt m=1 w=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_ms__dlxtn_4
diff --git a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.netlist.tsv b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.netlist.tsv
index d556173..2f6540f 100644
--- a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.netlist.tsv
+++ b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.netlist.tsv
@@ -1,20 +1,20 @@
 sky130_fd_sc_ms__dlxtn_4	D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net55	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net55	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net78	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net78	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net55	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net55	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net78	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net78	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.spice b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.spice
index a001cd2..121a653 100644
--- a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.spice
+++ b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_ms__dlxtn_4 D GATE_N VGND VNB VPB VPWR Q
-M1000 a_792_508# a_232_114# a_678_392# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.262e+11p ps=2.78e+06u
-M1001 a_678_392# a_232_114# a_658_79# VNB nlowvt w=640000u l=150000u
-+  ad=3.259e+11p pd=2.57e+06u as=1.536e+11p ps=1.76e+06u
-M1002 a_658_79# a_27_115# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.78397e+12p ps=1.439e+07u
-M1003 VGND a_840_395# a_895_123# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1004 a_840_395# a_678_392# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.73e+11p pd=2.33e+06u as=2.1628e+12p ps=1.704e+07u
-M1005 VGND a_232_114# a_369_392# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1006 a_232_114# GATE_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1007 VGND a_678_392# a_840_395# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1008 a_895_123# a_369_392# a_678_392# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_678_392# a_369_392# a_594_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1010 VGND D a_27_115# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1011 VPWR D a_27_115# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1012 Q a_840_395# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.888e+11p pd=5.71e+06u as=0p ps=0u
-M1013 Q a_840_395# VGND VNB nlowvt w=740000u l=150000u
-+  ad=5.143e+11p pd=4.35e+06u as=0p ps=0u
-M1014 VPWR a_840_395# a_792_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Q a_840_395# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_232_114# GATE_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1017 VPWR a_840_395# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Q a_840_395# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_840_395# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_232_114# a_369_392# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1021 a_594_392# a_27_115# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_678_392# a_840_395# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_840_395# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_840_395# a_678_392# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_840_395# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_115# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X1 VPWR a_27_115# a_594_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VPWR a_840_395# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_792_508# a_840_395# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X4 VGND GATE_N a_232_114# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_678_392# a_369_392# a_895_123# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X6 a_895_123# a_840_395# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 VGND a_678_392# a_840_395# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 VGND a_840_395# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_369_392# a_232_114# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X10 Q a_840_395# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_678_392# a_232_114# a_792_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X12 a_840_395# a_678_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 VPWR a_678_392# a_840_395# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X14 a_840_395# a_678_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X15 VPWR GATE_N a_232_114# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X16 Q a_840_395# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_27_115# D VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X18 Q a_840_395# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_369_392# a_232_114# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_594_392# a_369_392# a_678_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X21 VPWR a_840_395# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 Q a_840_395# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_658_79# a_232_114# a_678_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X24 VGND a_840_395# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 VGND a_27_115# a_658_79# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.cdl b/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.cdl
index b356966..3cf8a2c 100644
--- a/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.cdl
+++ b/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_ms__dlxtp_1 D GATE VGND VNB VPB VPWR Q
 *.PININFO D:I GATE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkpos clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 M0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkneg GATE VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI633 clkneg GATE VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net51 db VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI18 net51 db VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net55 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkneg GATE VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 net55 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net78 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI651 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 m1 M0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI638 db D VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net78 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__dlxtp_1
diff --git a/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.netlist.tsv b/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.netlist.tsv
index 1a4e11f..c7c564b 100644
--- a/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.netlist.tsv
+++ b/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.netlist.tsv
@@ -1,20 +1,20 @@
 sky130_fd_sc_ms__dlxtp_1	D:I GATE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net55	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net55	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net78	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net78	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net55	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net55	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net78	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net78	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.spice b/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.spice
index 795ae63..b7701ac 100644
--- a/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.spice
+++ b/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ms__dlxtp_1 D GATE VGND VNB VPB VPWR Q
-M1000 Q a_386_326# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=1.60698e+12p ps=1.245e+07u
-M1001 VGND a_119_88# a_239_85# VNB nlowvt w=740000u l=150000u
-+  ad=1.47895e+12p pd=1.06e+07u as=4.458e+11p ps=4.22e+06u
-M1002 a_422_392# a_386_326# VPWR VPB pshort w=420000u l=180000u
-+  ad=3.0425e+11p pd=3.2e+06u as=0p ps=0u
-M1003 a_685_59# a_562_123# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1004 a_592_149# a_562_123# a_514_149# VNB nlowvt w=420000u l=150000u
-+  ad=2.753e+11p pd=2.41e+06u as=1.008e+11p ps=1.32e+06u
-M1005 Q a_386_326# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1006 a_119_88# D VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.815e+11p pd=1.76e+06u as=0p ps=0u
-M1007 VPWR a_119_88# a_229_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.6e+11p ps=5.12e+06u
-M1008 a_119_88# D VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1009 VGND a_592_149# a_386_326# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1010 VPWR a_592_149# a_386_326# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.528e+11p ps=2.87e+06u
-M1011 a_685_59# a_562_123# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1012 VPWR GATE a_562_123# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1013 a_592_149# a_562_123# a_229_392# VPB pshort w=1e+06u l=180000u
-+  ad=3.115e+11p pd=2.71e+06u as=0p ps=0u
-M1014 a_514_149# a_386_326# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_239_85# a_685_59# a_592_149# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND GATE a_562_123# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.22e+11p ps=2.08e+06u
-M1017 a_422_392# a_685_59# a_592_149# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_592_149# a_685_59# a_239_85# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_229_392# a_119_88# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VPWR a_386_326# a_422_392# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X3 VGND a_386_326# a_514_149# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 a_229_392# a_562_123# a_592_149# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_592_149# a_685_59# a_422_392# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X6 a_386_326# a_592_149# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND D a_119_88# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X8 VGND a_386_326# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_562_123# GATE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_562_123# GATE VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X11 a_239_85# a_119_88# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_386_326# a_592_149# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VPWR D a_119_88# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X14 VPWR a_562_123# a_685_59# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X15 a_514_149# a_562_123# a_592_149# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X16 VGND a_562_123# a_685_59# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 VPWR a_386_326# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.cdl b/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.cdl
index 4f1a765..08a4195 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.cdl
+++ b/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__dlygate4sd1_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab net34 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab net34 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X Ab VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net34 net30 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net30 A VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab net34 VPB pfet_01v8 m=1 w=1 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 X Ab VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net34 net30 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net34 net30 VPB pfet_01v8 m=1 w=1 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net30 A VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab net34 VPB pshort m=1 w=1 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net34 net30 VPB pshort m=1 w=1 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net30 A VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI8 net30 A VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__dlygate4sd1_1
diff --git a/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.netlist.tsv b/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.netlist.tsv
index b3650d3..79cc0b6 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.netlist.tsv
+++ b/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__dlygate4sd1_1	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Ab	net34	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net34	net30	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net30	A	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	net34	VPWR	VPB	pshort	1	1	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net34	net30	VPWR	VPB	pshort	1	1	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net30	A	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	net34	VGND	VNB	nfet_01v8_lvt	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_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net34	net30	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net30	A	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	net34	VPWR	VPB	pfet_01v8	1	1	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net34	net30	VPWR	VPB	pfet_01v8	1	1	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net30	A	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.spice b/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.spice
index b277867..845f3e5 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.spice
+++ b/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__dlygate4sd1_1 A VGND VNB VPB VPWR X
-M1000 VPWR a_288_74# a_405_138# VPB pshort w=1e+06u l=180000u
-+  ad=9.874e+11p pd=6.28e+06u as=5.8e+11p ps=3.16e+06u
-M1001 X a_405_138# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.968e+11p pd=2.77e+06u as=0p ps=0u
-M1002 a_288_74# a_28_74# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
-M1003 VGND a_288_74# a_405_138# VNB nlowvt w=420000u l=150000u
-+  ad=5.384e+11p pd=4.48e+06u as=2.562e+11p ps=2.06e+06u
-M1004 VPWR A a_28_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VGND A a_28_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 X a_405_138# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1007 a_288_74# a_28_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_405_138# a_288_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VGND a_405_138# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X3 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 a_405_138# a_288_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 VPWR a_28_74# a_288_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 VPWR a_405_138# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND a_28_74# a_288_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.cdl b/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.cdl
index 14910b0..fc748b9 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.cdl
+++ b/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__dlygate4sd2_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab net34 VNB nlowvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab net34 VNB nfet_01v8_lvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X Ab VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net34 net30 VNB nfet_01v8_lvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net30 A VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab net34 VPB pfet_01v8 m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 X Ab VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net34 net30 VNB nlowvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI7 net34 net30 VPB pfet_01v8 m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net30 A VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab net34 VPB pshort m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net34 net30 VPB pshort m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net30 A VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI8 net30 A VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__dlygate4sd2_1
diff --git a/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.netlist.tsv b/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.netlist.tsv
index d96bb45..0af1320 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.netlist.tsv
+++ b/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__dlygate4sd2_1	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Ab	net34	VGND	VNB	nlowvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net34	net30	VGND	VNB	nlowvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net30	A	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	net34	VPWR	VPB	pshort	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net34	net30	VPWR	VPB	pshort	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net30	A	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	net34	VGND	VNB	nfet_01v8_lvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net34	net30	VGND	VNB	nfet_01v8_lvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net30	A	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	net34	VPWR	VPB	pfet_01v8	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net34	net30	VPWR	VPB	pfet_01v8	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net30	A	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.spice b/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.spice
index 4726dc4..a337a8b 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.spice
+++ b/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__dlygate4sd2_1 A VGND VNB VPB VPWR X
-M1000 X a_405_138# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.968e+11p pd=2.77e+06u as=9.174e+11p ps=6.14e+06u
-M1001 VPWR A a_28_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1002 a_288_74# a_28_74# VGND VNB nlowvt w=420000u l=180000u
-+  ad=1.113e+11p pd=1.37e+06u as=5.258e+11p ps=4.42e+06u
-M1003 VGND A a_28_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 VGND a_288_74# a_405_138# VNB nlowvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.436e+11p ps=2e+06u
-M1005 X a_405_138# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1006 VPWR a_288_74# a_405_138# VPB pshort w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.1e+11p ps=3.02e+06u
-M1007 a_288_74# a_28_74# VPWR VPB pshort w=1e+06u l=250000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
+X0 a_405_138# a_288_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=180000u
+X1 VGND a_405_138# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X3 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 VPWR a_405_138# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_405_138# a_288_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=250000u
+X6 VGND a_28_74# a_288_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=180000u
+X7 VPWR a_28_74# a_288_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=250000u
 .ends
diff --git a/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.cdl b/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.cdl
index 7567baf..beaac53 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.cdl
+++ b/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__dlygate4sd3_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab net34 VNB nlowvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab net34 VNB nfet_01v8_lvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X Ab VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net34 net30 VNB nfet_01v8_lvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net30 A VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab net34 VPB pfet_01v8 m=1 w=1 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 X Ab VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net34 net30 VNB nlowvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI7 net34 net30 VPB pfet_01v8 m=1 w=1 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net30 A VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab net34 VPB pshort m=1 w=1 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net34 net30 VPB pshort m=1 w=1 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net30 A VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI8 net30 A VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__dlygate4sd3_1
diff --git a/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.netlist.tsv b/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.netlist.tsv
index 3002636..e34888f 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.netlist.tsv
+++ b/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__dlygate4sd3_1	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Ab	net34	VGND	VNB	nlowvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net34	net30	VGND	VNB	nlowvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net30	A	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	net34	VPWR	VPB	pshort	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net34	net30	VPWR	VPB	pshort	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net30	A	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	net34	VGND	VNB	nfet_01v8_lvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net34	net30	VGND	VNB	nfet_01v8_lvt	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net30	A	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	net34	VPWR	VPB	pfet_01v8	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net34	net30	VPWR	VPB	pfet_01v8	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net30	A	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.spice b/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.spice
index 997ba43..b7408e1 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.spice
+++ b/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__dlygate4sd3_1 A VGND VNB VPB VPWR X
-M1000 X a_405_138# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.968e+11p pd=2.77e+06u as=6.674e+11p ps=5.64e+06u
-M1001 a_289_74# a_28_74# VGND VNB nlowvt w=420000u l=180000u
-+  ad=1.092e+11p pd=1.36e+06u as=5.279e+11p ps=4.43e+06u
-M1002 VPWR a_289_74# a_405_138# VPB pshort w=1e+06u l=500000u
-+  ad=0p pd=0u as=2.6e+11p ps=2.52e+06u
-M1003 a_289_74# a_28_74# VPWR VPB pshort w=1e+06u l=500000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
-M1004 VPWR A a_28_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VGND A a_28_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 VGND a_289_74# a_405_138# VNB nlowvt w=420000u l=180000u
-+  ad=0p pd=0u as=2.436e+11p ps=2e+06u
-M1007 X a_405_138# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
+X0 a_405_138# a_289_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=180000u
+X1 VPWR a_28_74# a_289_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=500000u
+X2 VGND a_405_138# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X4 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 VPWR a_405_138# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VGND a_28_74# a_289_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=180000u
+X7 a_405_138# a_289_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=500000u
 .ends
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.cdl b/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.cdl
index f7ef423..d882ee4 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.cdl
+++ b/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__dlymetal6s2s_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab net055 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab net055 VNB nfet_01v8_lvt m=1 w=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 net47 Ab VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net055 net59 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 net55 A VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net59 X VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 X net55 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab net055 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 net47 Ab VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net055 net59 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net59 X VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 net47 Ab VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 X net55 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net055 net59 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net55 A VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net59 X VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 X net55 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab net055 VPB pshort m=1 w=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 net47 Ab VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net055 net59 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net59 X VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 X net55 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 net55 A VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI17 net55 A VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__dlymetal6s2s_1
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.netlist.tsv b/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.netlist.tsv
index dd1efa2..730f311 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.netlist.tsv
+++ b/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__dlymetal6s2s_1	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Ab	net055	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	net47	Ab	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net055	net59	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net55	A	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net59	X	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	X	net55	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	net055	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	net47	Ab	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net055	net59	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net59	X	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	X	net55	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	net55	A	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	net055	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	net47	Ab	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net055	net59	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net55	A	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net59	X	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	X	net55	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	net055	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	net47	Ab	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net055	net59	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net59	X	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	X	net55	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	net55	A	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.spice b/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.spice
index 5d407d1..fdd563f 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.spice
+++ b/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__dlymetal6s2s_1 A VGND VNB VPB VPWR X
-M1000 VPWR A a_28_138# VPB pshort w=420000u l=180000u
-+  ad=9.737e+11p pd=8.74e+06u as=1.092e+11p ps=1.36e+06u
-M1001 VGND a_497_74# a_604_138# VNB nlowvt w=420000u l=150000u
-+  ad=6.828e+11p pd=6.48e+06u as=1.113e+11p ps=1.37e+06u
-M1002 X a_28_138# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1003 X a_28_138# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1004 VPWR X a_316_138# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1005 a_785_74# a_604_138# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1006 VGND A a_28_138# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 VGND X a_316_138# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 a_497_74# a_316_138# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1009 a_497_74# a_316_138# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1010 VPWR a_497_74# a_604_138# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1011 a_785_74# a_604_138# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
+X0 VPWR a_316_138# a_497_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_604_138# a_497_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X2 VGND a_28_138# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_316_138# X VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 a_28_138# A VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X5 VGND a_604_138# a_785_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR a_604_138# a_785_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND a_316_138# a_497_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_28_138# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 VPWR a_28_138# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_316_138# X VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X11 a_604_138# a_497_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.cdl b/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.cdl
index eec2795..3d8e680 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.cdl
+++ b/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__dlymetal6s4s_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab X VNB nlowvt m=1 w=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 net47 Ab VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 X net59 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net55 A VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net59 net043 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net043 net55 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMIN1 Ab X VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab X VPB pshort m=1 w=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 net47 Ab VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 X net59 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net59 net043 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net043 net55 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MMIN2 net47 Ab VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 net55 A VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI6 X net59 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 net55 A VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net59 net043 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 net043 net55 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab X VPB pfet_01v8 m=1 w=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 net47 Ab VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 X net59 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net59 net043 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net043 net55 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 net55 A VPB pfet_01v8 m=1 w=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_ms__dlymetal6s4s_1
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.netlist.tsv b/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.netlist.tsv
index eaf78b9..ca8de1c 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.netlist.tsv
+++ b/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__dlymetal6s4s_1	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Ab	X	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	net47	Ab	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	X	net59	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net55	A	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net59	net043	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net043	net55	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	X	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	net47	Ab	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	net59	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net59	net043	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net043	net55	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	net55	A	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	X	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	net47	Ab	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	X	net59	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net55	A	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net59	net043	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net043	net55	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	X	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	net47	Ab	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	net59	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net59	net043	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net043	net55	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	net55	A	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.spice b/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.spice
index 527e93c..4bb9507 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.spice
+++ b/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__dlymetal6s4s_1 A VGND VNB VPB VPWR X
-M1000 VPWR A a_28_138# VPB pshort w=420000u l=180000u
-+  ad=9.737e+11p pd=8.74e+06u as=1.092e+11p ps=1.36e+06u
-M1001 VGND X a_604_138# VNB nlowvt w=420000u l=150000u
-+  ad=6.828e+11p pd=6.48e+06u as=1.113e+11p ps=1.37e+06u
-M1002 a_209_74# a_28_138# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1003 a_209_74# a_28_138# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1004 VPWR a_209_74# a_316_138# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1005 a_785_74# a_604_138# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1006 VGND A a_28_138# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 VGND a_209_74# a_316_138# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 X a_316_138# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1009 X a_316_138# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1010 VPWR X a_604_138# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1011 a_785_74# a_604_138# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
+X0 VPWR a_316_138# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_604_138# X VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X2 VGND a_28_138# a_209_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_316_138# a_209_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 a_28_138# A VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X5 VGND a_604_138# a_785_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR a_604_138# a_785_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND a_316_138# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_28_138# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 VPWR a_28_138# a_209_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_316_138# a_209_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X11 a_604_138# X VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.cdl b/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.cdl
index 06b12b2..28b692e 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.cdl
+++ b/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__dlymetal6s6s_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab net055 VNB nlowvt m=1 w=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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net055 net59 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net55 A VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net59 net043 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net043 net55 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMIN1 Ab net055 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab net055 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net055 net59 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net59 net043 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net043 net55 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MMIN2 X Ab VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 net55 A VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI6 net055 net59 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 net55 A VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net59 net043 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 net043 net55 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab net055 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net055 net59 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net59 net043 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net043 net55 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 net55 A VPB pfet_01v8 m=1 w=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_ms__dlymetal6s6s_1
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.netlist.tsv b/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.netlist.tsv
index 6e752cf..538bedd 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.netlist.tsv
+++ b/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__dlymetal6s6s_1	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Ab	net055	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net055	net59	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net55	A	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net59	net043	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net043	net55	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	net055	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net055	net59	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net59	net043	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net043	net55	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	net55	A	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	net055	VGND	VNB	nfet_01v8_lvt	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_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net055	net59	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net55	A	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net59	net043	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net043	net55	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	net055	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net055	net59	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net59	net043	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net043	net55	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	net55	A	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.spice b/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.spice
index 72b8544..5498762 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.spice
+++ b/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__dlymetal6s6s_1 A VGND VNB VPB VPWR X
-M1000 VPWR A a_28_138# VPB pshort w=420000u l=180000u
-+  ad=9.737e+11p pd=8.74e+06u as=1.092e+11p ps=1.36e+06u
-M1001 VGND a_497_74# a_604_138# VNB nlowvt w=420000u l=150000u
-+  ad=6.828e+11p pd=6.48e+06u as=1.113e+11p ps=1.37e+06u
-M1002 a_209_74# a_28_138# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1003 a_209_74# a_28_138# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1004 VPWR a_209_74# a_316_138# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1005 X a_604_138# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1006 VGND A a_28_138# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 VGND a_209_74# a_316_138# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 a_497_74# a_316_138# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1009 a_497_74# a_316_138# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1010 VPWR a_497_74# a_604_138# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.092e+11p ps=1.36e+06u
-M1011 X a_604_138# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
+X0 VPWR a_316_138# a_497_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_604_138# a_497_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X2 VGND a_28_138# a_209_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_316_138# a_209_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 a_28_138# A VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X5 VGND a_604_138# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR a_604_138# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND a_316_138# a_497_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_28_138# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 VPWR a_28_138# a_209_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_316_138# a_209_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X11 a_604_138# a_497_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_1.cdl b/cells/ebufn/sky130_fd_sc_ms__ebufn_1.cdl
index b6933aa..520ffa2 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_1.cdl
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__ebufn_1 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z net47 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA net43 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net43 TE_B VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net47 A VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net47 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MMN0 Z net47 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 net43 TE_B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net47 A VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 sndA net43 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 net43 TE_B VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net47 A VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net47 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net43 TE_B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net47 A VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__ebufn_1
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_1.netlist.tsv b/cells/ebufn/sky130_fd_sc_ms__ebufn_1.netlist.tsv
index d0948ad..42fb01c 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_1.netlist.tsv
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__ebufn_1	A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMN0	MOSFET	Z	net47	sndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net43	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net43	TE_B	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net47	A	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net47	Z	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net43	TE_B	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net47	A	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net47	sndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net43	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net43	TE_B	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net47	A	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net47	Z	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net43	TE_B	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net47	A	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_1.spice b/cells/ebufn/sky130_fd_sc_ms__ebufn_1.spice
index a921307..d543960 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_1.spice
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__ebufn_1 A TE_B VGND VNB VPB VPWR Z
-M1000 VPWR TE_B a_27_404# VPB pshort w=840000u l=180000u
-+  ad=7.441e+11p pd=5.78e+06u as=2.352e+11p ps=2.24e+06u
-M1001 a_569_368# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.688e+11p pd=2.72e+06u as=0p ps=0u
-M1002 a_229_74# A VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.4575e+11p pd=1.63e+06u as=3.759e+11p ps=3.75e+06u
-M1003 a_229_74# A VPWR VPB pshort w=840000u l=180000u
-+  ad=2.436e+11p pd=2.26e+06u as=0p ps=0u
-M1004 Z a_229_74# a_569_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1005 a_569_74# a_27_404# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1006 Z a_229_74# a_569_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1007 VGND TE_B a_27_404# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
+X0 VGND A a_229_74# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X1 VPWR A a_229_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 VPWR TE_B a_569_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_569_368# a_229_74# Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_27_404# TE_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X5 a_27_404# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X6 a_569_74# a_229_74# Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VGND a_27_404# a_569_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_2.cdl b/cells/ebufn/sky130_fd_sc_ms__ebufn_2.cdl
index 04e0577..a43ffc0 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_2.cdl
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__ebufn_2 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z net47 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA net43 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net43 TE_B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net47 A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net47 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265
+MMN0 Z net47 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 net43 TE_B VPB pshort m=1 w=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 net47 A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 sndA net43 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 net43 TE_B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net47 A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net47 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net43 TE_B VPB pfet_01v8 m=1 w=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 net47 A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__ebufn_2
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_2.netlist.tsv b/cells/ebufn/sky130_fd_sc_ms__ebufn_2.netlist.tsv
index be263bd..4532cda 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_2.netlist.tsv
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__ebufn_2	A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMN0	MOSFET	Z	net47	sndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net43	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net43	TE_B	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net47	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net47	Z	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net43	TE_B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net47	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net47	sndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net43	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net43	TE_B	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net47	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net47	Z	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net43	TE_B	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net47	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_2.spice b/cells/ebufn/sky130_fd_sc_ms__ebufn_2.spice
index 6925159..394f4af 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_2.spice
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__ebufn_2 A TE_B VGND VNB VPB VPWR Z
-M1000 a_84_48# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=4.797e+11p ps=4.17e+06u
-M1001 VPWR TE_B a_283_48# VPB pshort w=1e+06u l=180000u
-+  ad=1.0179e+12p pd=6.44e+06u as=2.8e+11p ps=2.56e+06u
-M1002 VGND a_283_48# a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=7.289e+11p ps=6.41e+06u
-M1003 a_27_74# a_283_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR TE_B a_33_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=9.856e+11p ps=8.48e+06u
-M1005 a_33_368# a_84_48# Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.584e+11p ps=2.88e+06u
-M1006 a_33_368# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Z a_84_48# a_33_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Z a_84_48# a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1009 a_27_74# a_84_48# Z VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_84_48# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1011 VGND TE_B a_283_48# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
+X0 VPWR A a_84_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 Z a_84_48# a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VGND A a_84_48# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_33_368# a_84_48# Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_27_74# a_283_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_283_48# TE_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 Z a_84_48# a_33_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VPWR TE_B a_33_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VGND a_283_48# a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_283_48# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_27_74# a_84_48# Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_33_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_4.cdl b/cells/ebufn/sky130_fd_sc_ms__ebufn_4.cdl
index df5d698..e059fcb 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_4.cdl
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__ebufn_4 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z net47 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA net43 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net43 TE_B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net47 A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net47 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265
+MMN0 Z net47 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 net43 TE_B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net47 A VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 sndA net43 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 net43 TE_B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net47 A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net47 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net43 TE_B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net47 A VPB pfet_01v8 m=1 w=1.12 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_ms__ebufn_4
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_4.netlist.tsv b/cells/ebufn/sky130_fd_sc_ms__ebufn_4.netlist.tsv
index ba34b41..3b5c87b 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_4.netlist.tsv
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__ebufn_4	A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMN0	MOSFET	Z	net47	sndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net43	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net43	TE_B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net47	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net47	Z	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net43	TE_B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net47	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net47	sndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net43	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net43	TE_B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net47	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net47	Z	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net43	TE_B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net47	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_4.spice b/cells/ebufn/sky130_fd_sc_ms__ebufn_4.spice
index 064ba6f..8a4c780 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_4.spice
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__ebufn_4 A TE_B VGND VNB VPB VPWR Z
-M1000 Z a_27_368# a_348_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=1.5288e+12p ps=1.393e+07u
-M1001 a_208_74# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=9.352e+11p ps=8.39e+06u
-M1002 a_348_368# a_27_368# Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Z a_27_368# a_348_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A a_27_368# VNB nlowvt w=740000u l=150000u
-+  ad=6.216e+11p pd=6.12e+06u as=2.109e+11p ps=2.05e+06u
-M1005 a_378_74# a_27_368# Z VNB nlowvt w=740000u l=150000u
-+  ad=1.0323e+12p pd=1.019e+07u as=4.292e+11p ps=4.12e+06u
-M1006 VPWR A a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1007 VGND a_208_74# a_378_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_378_74# a_208_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_208_74# a_378_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_348_368# a_27_368# Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_208_74# TE_B VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1012 a_378_74# a_27_368# Z VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR TE_B a_348_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Z a_27_368# a_378_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_378_74# a_208_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_348_368# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR TE_B a_348_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Z a_27_368# a_378_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_348_368# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR TE_B a_348_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_378_74# a_208_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VPWR TE_B a_348_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Z a_27_368# a_378_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VGND a_208_74# a_378_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 Z a_27_368# a_348_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VGND TE_B a_208_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR TE_B a_208_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_27_368# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_378_74# a_27_368# Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 Z a_27_368# a_378_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_348_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_348_368# a_27_368# Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_348_368# a_27_368# Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 Z a_27_368# a_348_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_378_74# a_208_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_378_74# a_27_368# Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_348_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 VGND a_208_74# a_378_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_8.cdl b/cells/ebufn/sky130_fd_sc_ms__ebufn_8.cdl
index 66f7970..377b2b1 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_8.cdl
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_8.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__ebufn_8 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z net47 VNB nlowvt m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA net43 VNB nlowvt m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net43 TE_B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net47 A VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB pshort m=8 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net47 VPB pshort m=8 w=1.12 l=0.18 mult=1 sa=0.265
+MMN0 Z net47 VNB nfet_01v8_lvt m=8 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 net43 TE_B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net47 A VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMN1 sndA net43 VNB nfet_01v8_lvt m=8 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 net43 TE_B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net47 A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB pfet_01v8 m=8 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net47 VPB pfet_01v8 m=8 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net43 TE_B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net47 A VPB pfet_01v8 m=2 w=1.12 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_ms__ebufn_8
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_8.netlist.tsv b/cells/ebufn/sky130_fd_sc_ms__ebufn_8.netlist.tsv
index 32af83d..2a8c708 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_8.netlist.tsv
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_8.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__ebufn_8	A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMN0	MOSFET	Z	net47	sndA	VNB	nlowvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net43	VGND	VNB	nlowvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net43	TE_B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net47	A	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pshort	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net47	Z	VPB	pshort	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net43	TE_B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net47	A	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net47	sndA	VNB	nfet_01v8_lvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net43	VGND	VNB	nfet_01v8_lvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net43	TE_B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net47	A	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pfet_01v8	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net47	Z	VPB	pfet_01v8	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net43	TE_B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net47	A	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_8.spice b/cells/ebufn/sky130_fd_sc_ms__ebufn_8.spice
index 37d7a54..6490808 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_8.spice
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_8.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_ms__ebufn_8 A TE_B VGND VNB VPB VPWR Z
-M1000 a_27_74# a_833_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.0054e+12p pd=1.874e+07u as=1.2506e+12p ps=1.226e+07u
-M1001 Z a_84_48# a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.3048e+12p pd=1.129e+07u as=2.8168e+12p ps=2.519e+07u
-M1002 a_28_368# a_84_48# Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_833_48# a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_74# a_833_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_28_368# a_84_48# Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Z a_84_48# a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_74# a_84_48# Z VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=9.213e+11p ps=8.41e+06u
-M1008 Z a_84_48# a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_28_368# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.4573e+12p ps=1.808e+07u
-M1010 a_28_368# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_84_48# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1012 Z a_84_48# a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Z a_84_48# a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_28_368# a_84_48# Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR TE_B a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_28_368# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_28_368# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR TE_B a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_74# a_84_48# Z VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_833_48# a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR TE_B a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR TE_B a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A a_84_48# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_833_48# a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_833_48# a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_84_48# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1027 Z a_84_48# a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR TE_B a_833_48# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=5.544e+11p ps=3.23e+06u
-M1029 VGND TE_B a_833_48# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1030 Z a_84_48# a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_27_74# a_84_48# Z VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR A a_84_48# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Z a_84_48# a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_27_74# a_833_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_28_368# a_84_48# Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_27_74# a_84_48# Z VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_27_74# a_833_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Z a_84_48# a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_27_74# a_84_48# Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_28_368# a_84_48# Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VPWR TE_B a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_27_74# a_833_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VGND A a_84_48# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_28_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Z a_84_48# a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_28_368# a_84_48# Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 Z a_84_48# a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_28_368# a_84_48# Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VPWR TE_B a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_27_74# a_833_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_27_74# a_84_48# Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VGND a_833_48# a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_28_368# a_84_48# Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_28_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_27_74# a_833_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_27_74# a_833_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_833_48# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 VPWR TE_B a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 VPWR TE_B a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 VGND a_833_48# a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 Z a_84_48# a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_84_48# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 Z a_84_48# a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 a_28_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 a_28_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 Z a_84_48# a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X29 VPWR A a_84_48# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X30 Z a_84_48# a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 VGND a_833_48# a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X32 Z a_84_48# a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X33 a_27_74# a_84_48# Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 a_833_48# TE_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X35 a_84_48# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X36 a_27_74# a_84_48# Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X37 VGND a_833_48# a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.cdl b/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.cdl
index 65fb4aa..7d898aa 100644
--- a/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.cdl
+++ b/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.cdl
@@ -16,76 +16,76 @@
 
 .SUBCKT sky130_fd_sc_ms__edfxbp_1 CLK D DE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I DE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI14 net71 M1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI14 net71 M1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI637 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 S0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI13 S0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 net131 deneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI655 net131 deneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net88 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net103 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q_N S1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net116 DE VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 S1 S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 db S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 deneg DE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI651 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 Q S0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N S1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI658 net88 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net103 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net152 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q_N S1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI659 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net116 DE VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 S1 S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net195 DE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 db S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI4 deneg DE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net172 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI634 M1 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N S1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net152 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net195 DE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net172 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 S1 S0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 net184 M1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 deneg DE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 S1 S0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net184 M1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 S0 clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 deneg DE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI11 db S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net204 deneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI11 db S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 net204 deneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__edfxbp_1
diff --git a/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.netlist.tsv b/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.netlist.tsv
index 706abac..286000b 100644
--- a/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.netlist.tsv
+++ b/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_ms__edfxbp_1	CLK:I D:I DE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI14	MOSFET	net71	M1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	S0	clkneg	net71	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	net131	deneg	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net88	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net103	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net103	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	S1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net88	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net116	DE	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	S1	S0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	db	S1	net116	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	deneg	DE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	db	D	net131	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	S1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net152	S1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net152	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net195	DE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net172	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net172	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net184	M1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	S0	clkpos	net184	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	deneg	DE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	db	D	net195	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	db	S1	net204	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net204	deneg	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net71	M1	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	S0	clkneg	net71	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	net131	deneg	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net88	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net103	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net103	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q_N	S1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net88	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net116	DE	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	db	S1	net116	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	deneg	DE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	db	D	net131	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	S1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net152	S1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net152	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net195	DE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net172	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net172	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net184	M1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	S0	clkpos	net184	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	deneg	DE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	db	D	net195	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	db	S1	net204	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net204	deneg	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.spice b/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.spice
index 6c40929..671a059 100644
--- a/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.spice
+++ b/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_ms__edfxbp_1 CLK D DE VGND VNB VPB VPWR Q Q_N
-M1000 a_1198_97# a_1008_74# a_27_74# VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=4.349e+11p ps=4.69e+06u
-M1001 a_527_74# a_161_446# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.908e+12p ps=1.641e+07u
-M1002 a_27_74# a_575_48# a_527_74# VNB nlowvt w=420000u l=150000u
-+  ad=4.158e+11p pd=4.5e+06u as=0p ps=0u
-M1003 a_2209_443# a_1008_74# a_1879_74# VPB pshort w=420000u l=180000u
-+  ad=1.26e+11p pd=1.44e+06u as=3.262e+11p ps=2.78e+06u
-M1004 a_1807_74# a_1419_71# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.554e+11p pd=1.9e+06u as=0p ps=0u
-M1005 a_1419_71# a_1198_97# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=2.42065e+12p ps=2.12e+07u
-M1006 a_1879_74# a_1008_74# a_1807_74# VNB nlowvt w=740000u l=150000u
-+  ad=7.478e+11p pd=4.66e+06u as=0p ps=0u
-M1007 a_1426_508# a_818_74# a_1198_97# VPB pshort w=420000u l=180000u
-+  ad=1.386e+11p pd=1.5e+06u as=0p ps=0u
-M1008 VPWR DE a_161_446# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1009 a_559_504# DE VPWR VPB pshort w=420000u l=180000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1010 VGND a_575_48# a_2227_118# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1011 VPWR a_161_446# a_119_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1012 a_2011_392# a_1419_71# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1013 a_575_48# a_1879_74# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1014 a_1334_97# a_1008_74# a_1198_97# VNB nlowvt w=420000u l=150000u
-+  ad=1.785e+11p pd=1.69e+06u as=2.226e+11p ps=1.9e+06u
-M1015 a_1419_71# a_1198_97# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1016 a_575_48# a_1879_74# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1017 VGND a_1879_74# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1018 VGND DE a_145_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1019 VGND a_1419_71# a_1334_97# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Q_N a_575_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1021 a_2227_118# a_818_74# a_1879_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_575_48# a_2209_443# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_1419_71# a_1426_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND DE a_161_446# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.281e+11p ps=1.45e+06u
-M1025 a_818_74# CLK VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1026 VPWR a_1879_74# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1027 a_119_508# D a_27_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1008_74# a_818_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1029 a_1008_74# a_818_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1030 Q_N a_575_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1031 a_818_74# CLK VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1032 a_145_74# D a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_27_74# a_575_48# a_559_504# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1198_97# a_818_74# a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1879_74# a_818_74# a_2011_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1334_97# a_1419_71# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X1 a_27_74# a_818_74# a_1198_97# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 VGND a_1419_71# a_1807_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_27_74# a_1008_74# a_1198_97# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X4 VPWR a_1198_97# a_1419_71# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 a_1198_97# a_818_74# a_1426_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X6 a_2227_118# a_575_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 a_161_446# DE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X8 Q a_1879_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_27_74# D a_145_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 a_161_446# DE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X11 VGND a_818_74# a_1008_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_2011_392# a_818_74# a_1879_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 a_1807_74# a_1008_74# a_1879_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VPWR a_1419_71# a_2011_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X15 a_27_74# D a_119_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X16 a_1879_74# a_1008_74# a_2209_443# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X17 a_1879_74# a_818_74# a_2227_118# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X18 VGND a_575_48# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 VPWR DE a_559_504# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X20 a_527_74# a_575_48# a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X21 VGND a_1198_97# a_1419_71# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X22 VPWR a_818_74# a_1008_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 VGND a_161_446# a_527_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X24 VGND a_1879_74# a_575_48# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X25 VPWR a_1879_74# a_575_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X26 a_1198_97# a_1008_74# a_1334_97# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 VPWR a_575_48# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 a_119_508# a_161_446# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X29 VGND CLK a_818_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X30 Q a_1879_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 a_559_504# a_575_48# a_27_74# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X32 a_145_74# DE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X33 a_2209_443# a_575_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X34 VPWR CLK a_818_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X35 a_1426_508# a_1419_71# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
 .ends
diff --git a/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.cdl b/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.cdl
index 2684e61..ed37c03 100644
--- a/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.cdl
+++ b/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.cdl
@@ -16,72 +16,72 @@
 
 .SUBCKT sky130_fd_sc_ms__edfxtp_1 CLK D DE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I DE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI14 net67 M1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI14 net67 M1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI637 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 S0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI13 S0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 net123 deneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI655 net123 deneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net103 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net99 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net108 DE VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 S1 S0 VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 db S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 deneg DE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 db D VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI651 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 Q S0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net143 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI658 net103 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net99 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net108 DE VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 S1 S0 VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net148 DE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 db S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI4 deneg DE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 db D VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net160 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI634 M1 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net143 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net148 DE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net160 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 S1 S0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 net172 M1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 deneg DE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 S1 S0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net172 M1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 S0 clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 deneg DE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI11 db S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net192 deneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI11 db S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 net192 deneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__edfxtp_1
diff --git a/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.netlist.tsv b/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.netlist.tsv
index 36a3e94..bdea45c 100644
--- a/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.netlist.tsv
+++ b/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.netlist.tsv
@@ -1,36 +1,36 @@
 sky130_fd_sc_ms__edfxtp_1	CLK:I D:I DE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI14	MOSFET	net67	M1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	S0	clkneg	net67	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	net123	deneg	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net103	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net99	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net99	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net103	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net108	DE	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	S1	S0	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	db	S1	net108	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	deneg	DE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	db	D	net123	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net143	S1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net143	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net148	DE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net160	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net160	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net172	M1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	S0	clkpos	net172	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	deneg	DE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	db	D	net148	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	db	S1	net192	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net192	deneg	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net67	M1	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	S0	clkneg	net67	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	net123	deneg	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net103	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net99	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net99	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net103	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net108	DE	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	db	S1	net108	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	deneg	DE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	db	D	net123	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net143	S1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net143	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net148	DE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net160	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net160	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net172	M1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	S0	clkpos	net172	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	deneg	DE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	db	D	net148	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	db	S1	net192	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net192	deneg	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.spice b/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.spice
index 56f1574..3600855 100644
--- a/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.spice
+++ b/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ms__edfxtp_1 CLK D DE VGND VNB VPB VPWR Q
-M1000 VPWR a_533_61# a_2091_502# VPB pshort w=420000u l=180000u
-+  ad=2.10553e+12p pd=1.949e+07u as=1.008e+11p ps=1.32e+06u
-M1001 VGND a_1409_64# a_1349_90# VNB nlowvt w=420000u l=150000u
-+  ad=1.8056e+12p pd=1.622e+07u as=1.26e+11p ps=1.44e+06u
-M1002 VGND a_533_61# a_1997_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1003 a_533_61# a_1895_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1004 a_1409_64# a_1156_90# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1005 a_958_74# a_763_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1006 VGND DE a_131_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 a_1997_74# a_763_74# a_1895_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.424e+11p ps=2.2e+06u
-M1008 a_117_508# D a_27_508# VPB pshort w=420000u l=180000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.339e+11p ps=4.11e+06u
-M1009 a_131_74# D a_27_508# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.591e+11p ps=4.23e+06u
-M1010 VGND DE a_159_446# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1011 a_763_74# CLK VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.035e+11p pd=2.03e+06u as=0p ps=0u
-M1012 a_1797_74# a_1409_64# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.516e+11p pd=2.16e+06u as=0p ps=0u
-M1013 a_1156_90# a_958_74# a_27_508# VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1014 a_533_61# a_1895_74# VPWR VPB pshort w=640000u l=180000u
-+  ad=1.664e+11p pd=1.8e+06u as=0p ps=0u
-M1015 VPWR a_159_446# a_117_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_557_436# DE VPWR VPB pshort w=420000u l=180000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1017 a_1385_508# a_763_74# a_1156_90# VPB pshort w=420000u l=180000u
-+  ad=1.365e+11p pd=1.49e+06u as=0p ps=0u
-M1018 a_1797_392# a_1409_64# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=7.55e+11p pd=3.51e+06u as=0p ps=0u
-M1019 VGND a_1895_74# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1020 VPWR a_1409_64# a_1385_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_491_87# a_159_446# VGND VNB nlowvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1022 a_27_508# a_533_61# a_491_87# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1409_64# a_1156_90# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1024 a_1156_90# a_763_74# a_27_508# VNB nlowvt w=420000u l=150000u
-+  ad=3.423e+11p pd=2.47e+06u as=0p ps=0u
-M1025 a_763_74# CLK VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1026 a_2091_502# a_958_74# a_1895_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=3.115e+11p ps=2.71e+06u
-M1027 a_27_508# a_533_61# a_557_436# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1349_90# a_958_74# a_1156_90# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1895_74# a_958_74# a_1797_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1895_74# a_763_74# a_1797_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_1895_74# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.912e+11p ps=2.76e+06u
-M1032 VPWR DE a_159_446# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1033 a_958_74# a_763_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
+X0 a_1997_74# a_533_61# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X1 VPWR a_1156_90# a_1409_64# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 VGND a_1409_64# a_1797_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_131_74# DE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 a_1797_74# a_958_74# a_1895_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_1156_90# a_763_74# a_1385_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X6 VGND a_763_74# a_958_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR a_1409_64# a_1797_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_159_446# DE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 a_1349_90# a_1409_64# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 VGND CLK a_763_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 Q a_1895_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_159_446# DE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X13 a_27_508# a_763_74# a_1156_90# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X14 VGND a_159_446# a_491_87# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X15 a_1156_90# a_958_74# a_1349_90# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X16 VGND a_1895_74# a_533_61# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X17 VPWR DE a_557_436# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X18 a_27_508# a_958_74# a_1156_90# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X19 a_1895_74# a_763_74# a_1997_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X20 a_1385_508# a_1409_64# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X21 a_117_508# a_159_446# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X22 VGND a_1156_90# a_1409_64# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X23 a_557_436# a_533_61# a_27_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X24 VPWR a_763_74# a_958_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 a_27_508# D a_131_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X26 a_491_87# a_533_61# a_27_508# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 a_1895_74# a_958_74# a_2091_502# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X28 a_27_508# D a_117_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X29 a_1797_392# a_763_74# a_1895_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X30 VPWR a_1895_74# a_533_61# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X31 VPWR CLK a_763_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 a_2091_502# a_533_61# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X33 Q a_1895_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_1.cdl b/cells/einvn/sky130_fd_sc_ms__einvn_1.cdl
index f20f2cf..c479229 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_1.cdl
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__einvn_1 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA net33 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net33 TE_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA net33 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 net33 TE_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 net33 TE_B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net33 TE_B VPB pfet_01v8 m=1 w=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_ms__einvn_1
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_1.netlist.tsv b/cells/einvn/sky130_fd_sc_ms__einvn_1.netlist.tsv
index f617b2f..cd763fd 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_1.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__einvn_1	A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMN0	MOSFET	Z	A	sndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net33	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net33	TE_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net33	TE_B	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net33	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net33	TE_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net33	TE_B	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_1.spice b/cells/einvn/sky130_fd_sc_ms__einvn_1.spice
index 6b96a98..5202aca 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_1.spice
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ms__einvn_1 A TE_B VGND VNB VPB VPWR Z
-M1000 a_281_368# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.688e+11p pd=2.72e+06u as=3.616e+11p ps=2.95e+06u
-M1001 Z A a_281_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1002 a_281_100# a_22_46# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=2.564e+11p ps=2.36e+06u
-M1003 Z A a_281_100# VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1004 VPWR TE_B a_22_46# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1005 VGND TE_B a_22_46# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
+X0 VPWR TE_B a_281_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_22_46# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X2 a_281_368# A Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VGND a_22_46# a_281_100# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_281_100# A Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_22_46# TE_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_2.cdl b/cells/einvn/sky130_fd_sc_ms__einvn_2.cdl
index 42e6162..29af312 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_2.cdl
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__einvn_2 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 TE TE_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 TE TE_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TE TE_B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 TE TE_B VPB pfet_01v8 m=1 w=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_ms__einvn_2
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_2.netlist.tsv b/cells/einvn/sky130_fd_sc_ms__einvn_2.netlist.tsv
index 3c4e221..b36f79c 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_2.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__einvn_2	A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMN0	MOSFET	Z	A	sndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TE	TE_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TE	TE_B	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TE	TE_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TE	TE_B	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_2.spice b/cells/einvn/sky130_fd_sc_ms__einvn_2.spice
index b6f9da4..bf7c066 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_2.spice
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__einvn_2 A TE_B VGND VNB VPB VPWR Z
-M1000 VGND a_117_74# a_231_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.269e+11p pd=3.45e+06u as=6.176e+11p ps=6.17e+06u
-M1001 a_231_74# A Z VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1002 VPWR TE_B a_227_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=4.784e+11p pd=4.61e+06u as=9.296e+11p ps=8.38e+06u
-M1003 a_227_368# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Z A a_227_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1005 a_227_368# A Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_117_74# TE_B VPWR VPB pshort w=640000u l=180000u
-+  ad=1.76e+11p pd=1.83e+06u as=0p ps=0u
-M1007 a_231_74# a_117_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Z A a_231_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_117_74# TE_B VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
+X0 a_231_74# a_117_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_227_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_227_368# A Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VGND a_117_74# a_231_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 Z A a_231_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_231_74# A Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR TE_B a_117_74# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X7 VGND TE_B a_117_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X8 VPWR TE_B a_227_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 Z A a_227_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_4.cdl b/cells/einvn/sky130_fd_sc_ms__einvn_4.cdl
index dd1c3dd..ecdb1eb 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_4.cdl
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__einvn_4 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 TE TE_B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 TE TE_B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TE TE_B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 TE TE_B VPB pfet_01v8 m=1 w=1.12 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_ms__einvn_4
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_4.netlist.tsv b/cells/einvn/sky130_fd_sc_ms__einvn_4.netlist.tsv
index 124f31b..149cee4 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_4.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__einvn_4	A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMN0	MOSFET	Z	A	sndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TE	TE_B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TE	TE_B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TE	TE_B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TE	TE_B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_4.spice b/cells/einvn/sky130_fd_sc_ms__einvn_4.spice
index b36117f..06dff6b 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_4.spice
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ms__einvn_4 A TE_B VGND VNB VPB VPWR Z
-M1000 VPWR TE_B a_241_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=9.744e+11p pd=8.46e+06u as=1.5344e+12p ps=1.394e+07u
-M1001 a_281_74# A Z VNB nlowvt w=740000u l=150000u
-+  ad=1.0508e+12p pd=1.024e+07u as=4.144e+11p ps=4.08e+06u
-M1002 a_241_368# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_281_74# a_114_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=6.253e+11p ps=6.13e+06u
-M1004 VPWR TE_B a_241_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_241_368# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_114_74# a_281_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_281_74# A Z VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Z A a_241_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1009 a_241_368# A Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Z A a_241_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_241_368# A Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Z A a_281_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_281_74# a_114_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_114_74# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1015 a_114_74# TE_B VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1016 Z A a_281_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_114_74# a_281_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_241_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 Z A a_281_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_281_74# a_114_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_241_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR TE_B a_241_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 Z A a_241_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 Z A a_241_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VPWR TE_B a_241_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_281_74# a_114_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VGND a_114_74# a_281_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND a_114_74# a_281_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 Z A a_281_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_281_74# A Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_241_368# A Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VPWR TE_B a_114_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_281_74# A Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_241_368# A Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VGND TE_B a_114_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_8.cdl b/cells/einvn/sky130_fd_sc_ms__einvn_8.cdl
index 0a2bc1b..d997d85 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_8.cdl
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__einvn_8 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nlowvt m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nlowvt m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8_lvt m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 TE TE_B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE VNB nfet_01v8_lvt m=8 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 TE TE_B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB pfet_01v8 m=8 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A VPB pfet_01v8 m=8 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB pshort m=8 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB pshort m=8 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TE TE_B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 TE TE_B VPB pfet_01v8 m=1 w=1.12 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_ms__einvn_8
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_8.netlist.tsv b/cells/einvn/sky130_fd_sc_ms__einvn_8.netlist.tsv
index a4e3c9c..df93948 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_8.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_8.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__einvn_8	A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMN0	MOSFET	Z	A	sndA	VNB	nlowvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nlowvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TE	TE_B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pshort	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	pshort	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TE	TE_B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8_lvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8_lvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TE	TE_B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pfet_01v8	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TE	TE_B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_8.spice b/cells/einvn/sky130_fd_sc_ms__einvn_8.spice
index 5b5f39e..974136c 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_8.spice
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_8.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ms__einvn_8 A TE_B VGND VNB VPB VPWR Z
-M1000 a_239_368# A Z VPB pshort w=1.12e+06u l=180000u
-+  ad=2.744e+12p pd=2.506e+07u as=1.2656e+12p ps=1.122e+07u
-M1001 Z A a_239_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_126_74# TE_B VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.1433e+12p ps=1.049e+07u
-M1003 a_293_74# a_126_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.924e+12p pd=1.852e+07u as=0p ps=0u
-M1004 Z A a_239_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_126_74# a_293_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Z A a_293_74# VNB nlowvt w=740000u l=150000u
-+  ad=9.324e+11p pd=8.44e+06u as=0p ps=0u
-M1007 a_239_368# A Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_126_74# a_293_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_126_74# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=1.8592e+12p ps=1.452e+07u
-M1010 Z A a_239_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Z A a_293_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_239_368# A Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Z A a_293_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Z A a_293_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_293_74# a_126_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_126_74# a_293_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_239_368# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_293_74# A Z VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR TE_B a_239_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_239_368# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_239_368# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_126_74# a_293_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR TE_B a_239_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_293_74# A Z VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR TE_B a_239_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_239_368# TE_B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_293_74# A Z VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR TE_B a_239_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_293_74# a_126_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_293_74# A Z VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_293_74# a_126_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Z A a_239_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_239_368# A Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Z A a_293_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 Z A a_239_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VPWR TE_B a_239_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_239_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 Z A a_239_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 Z A a_293_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 Z A a_293_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_293_74# a_126_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VPWR TE_B a_126_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VGND a_126_74# a_293_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VPWR TE_B a_239_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_239_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_239_368# A Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VGND a_126_74# a_293_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VPWR TE_B a_239_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_239_368# A Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_293_74# a_126_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 VPWR TE_B a_239_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 a_239_368# A Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 VGND a_126_74# a_293_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 VGND a_126_74# a_293_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 a_239_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_239_368# A Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_293_74# a_126_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 Z A a_293_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 VGND TE_B a_126_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 a_293_74# A Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 a_293_74# A Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 a_293_74# a_126_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_239_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X30 Z A a_239_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X31 a_293_74# A Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X32 a_293_74# A Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 Z A a_239_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_1.cdl b/cells/einvp/sky130_fd_sc_ms__einvp_1.cdl
index 17e1bea..a8d5574 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_1.cdl
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__einvp_1 A TE VGND VNB VPB VPWR Z
 *.PININFO A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 TEB TE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 TEB TE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TEB VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TEB VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndTEB A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TEB TE VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 TEB TE VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__einvp_1
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_1.netlist.tsv b/cells/einvp/sky130_fd_sc_ms__einvp_1.netlist.tsv
index 73575c3..d5e6861 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_1.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__einvp_1	A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMN0	MOSFET	Z	A	sndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TEB	TE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TEB	TE	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TEB	TE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TEB	TE	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_1.spice b/cells/einvp/sky130_fd_sc_ms__einvp_1.spice
index 08e39ff..044faed 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_1.spice
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ms__einvp_1 A TE VGND VNB VPB VPWR Z
-M1000 a_313_392# a_44_549# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=3.115e+11p ps=2.71e+06u
-M1001 a_318_74# TE VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=2.276e+11p ps=2.16e+06u
-M1002 Z A a_318_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1003 VGND TE a_44_549# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.604e+11p ps=2.08e+06u
-M1004 Z A a_313_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1005 VPWR TE a_44_549# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=2.583e+11p ps=2.07e+06u
+X0 VGND TE a_318_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_44_549# TE VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X2 a_44_549# TE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 a_313_392# A Z VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VPWR a_44_549# a_313_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_318_74# A Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_2.cdl b/cells/einvp/sky130_fd_sc_ms__einvp_2.cdl
index 39fc6a0..14b8f8b 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_2.cdl
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__einvp_2 A TE VGND VNB VPB VPWR Z
 *.PININFO A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 TEB TE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 TEB TE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TEB VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TEB VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndTEB A VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TEB TE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 TEB TE VPB pfet_01v8 m=1 w=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_ms__einvp_2
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_2.netlist.tsv b/cells/einvp/sky130_fd_sc_ms__einvp_2.netlist.tsv
index 8b6f392..2a1d35c 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_2.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__einvp_2	A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMN0	MOSFET	Z	A	sndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TEB	TE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TEB	TE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TEB	TE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TEB	TE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_2.spice b/cells/einvp/sky130_fd_sc_ms__einvp_2.spice
index dc55bf7..af176eb 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_2.spice
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__einvp_2 A TE VGND VNB VPB VPWR Z
-M1000 VGND TE a_263_323# VNB nlowvt w=420000u l=150000u
-+  ad=3.332e+11p pd=3.48e+06u as=1.197e+11p ps=1.41e+06u
-M1001 a_36_74# A Z VNB nlowvt w=740000u l=150000u
-+  ad=6.29e+11p pd=6.14e+06u as=2.072e+11p ps=2.04e+06u
-M1002 VPWR TE a_263_323# VPB pshort w=640000u l=180000u
-+  ad=4.816e+11p pd=4.62e+06u as=1.76e+11p ps=1.83e+06u
-M1003 Z A a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=9.24e+11p ps=8.37e+06u
-M1004 a_27_368# A Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_263_323# a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_368# a_263_323# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND TE a_36_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_36_74# TE VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Z A a_36_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Z A a_36_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_36_74# A Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 Z A a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VPWR a_263_323# a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_36_74# TE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_263_323# TE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X6 a_27_368# A Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND TE a_36_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_263_323# TE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 a_27_368# a_263_323# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_4.cdl b/cells/einvp/sky130_fd_sc_ms__einvp_4.cdl
index bba3c97..2604d22 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_4.cdl
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__einvp_4 A TE VGND VNB VPB VPWR Z
 *.PININFO A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 TEB TE VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 TEB TE VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TEB VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TEB VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndTEB A VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TEB TE VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 TEB TE VPB pfet_01v8 m=1 w=1.12 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_ms__einvp_4
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_4.netlist.tsv b/cells/einvp/sky130_fd_sc_ms__einvp_4.netlist.tsv
index eaa5120..006ec36 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_4.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__einvp_4	A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMN0	MOSFET	Z	A	sndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TEB	TE	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TEB	TE	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TEB	TE	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TEB	TE	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_4.spice b/cells/einvp/sky130_fd_sc_ms__einvp_4.spice
index 1aa0ae9..9eb8d92 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_4.spice
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ms__einvp_4 A TE VGND VNB VPB VPWR Z
-M1000 Z A a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.552e+11p pd=5.65e+06u as=1.652e+12p ps=1.415e+07u
-M1001 VGND TE a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=8.843e+11p pd=6.83e+06u as=1.1655e+12p ps=1.055e+07u
-M1002 Z A a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_368# A Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR a_473_323# a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=9.856e+11p pd=8.48e+06u as=0p ps=0u
-M1005 a_27_368# a_473_323# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_368# A Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_74# A Z VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.995e+11p ps=4.31e+06u
-M1008 VPWR a_473_323# a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_74# A Z VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# TE VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_74# TE VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR TE a_473_323# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1013 Z A a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND TE a_473_323# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1015 a_27_368# a_473_323# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Z A a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND TE a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_473_323# a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_27_368# A Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_27_74# TE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 Z A a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_27_368# A Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VGND TE a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_27_368# a_473_323# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Z A a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_27_74# TE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR a_473_323# a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_473_323# TE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 Z A a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_27_368# a_473_323# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 Z A a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_27_74# A Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_27_74# A Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 VGND TE a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_473_323# TE VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_8.cdl b/cells/einvp/sky130_fd_sc_ms__einvp_8.cdl
index 7505834..48a30bc 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_8.cdl
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__einvp_8 A TE VGND VNB VPB VPWR Z
 *.PININFO A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nlowvt m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nlowvt m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8_lvt m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 TEB TE VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE VNB nfet_01v8_lvt m=8 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 TEB TE VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TEB VPB pfet_01v8 m=8 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TEB VPB pshort m=8 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndTEB A VPB pfet_01v8 m=8 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB pshort m=8 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TEB TE VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 TEB TE VPB pfet_01v8 m=1 w=1.12 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_ms__einvp_8
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_8.netlist.tsv b/cells/einvp/sky130_fd_sc_ms__einvp_8.netlist.tsv
index 65c0adc..3eaaf62 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_8.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_8.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__einvp_8	A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMN0	MOSFET	Z	A	sndA	VNB	nlowvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nlowvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TEB	TE	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	pshort	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	pshort	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TEB	TE	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8_lvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8_lvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TEB	TE	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	pfet_01v8	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TEB	TE	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_8.spice b/cells/einvp/sky130_fd_sc_ms__einvp_8.spice
index 55a8b1e..5e4513c 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_8.spice
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_8.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ms__einvp_8 A TE VGND VNB VPB VPWR Z
-M1000 VPWR a_802_323# a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.512e+12p pd=1.39e+07u as=2.7328e+12p ps=2.504e+07u
-M1001 VGND TE a_802_323# VNB nlowvt w=740000u l=150000u
-+  ad=1.1433e+12p pd=1.049e+07u as=2.146e+11p ps=2.06e+06u
-M1002 a_27_368# a_802_323# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_802_323# a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_74# TE VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.0276e+12p pd=1.88e+07u as=0p ps=0u
-M1005 a_27_74# A Z VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=9.842e+11p ps=8.58e+06u
-M1006 Z A a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_74# TE VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_74# A Z VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_368# A Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=1.2096e+12p ps=1.112e+07u
-M1010 a_27_368# a_802_323# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND TE a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Z A a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_802_323# a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Z A a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_74# TE VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Z A a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_368# A Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_368# a_802_323# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_74# A Z VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Z A a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_802_323# a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Z A a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_368# A Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_368# a_802_323# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR TE a_802_323# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.024e+11p ps=2.78e+06u
-M1026 a_27_74# TE VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Z A a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Z A a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_27_74# A Z VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND TE a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND TE a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_27_368# A Z VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND TE a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_368# A Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_27_74# A Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_27_368# A Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VGND TE a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_27_74# A Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_27_368# a_802_323# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_27_74# TE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_27_74# TE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VPWR a_802_323# a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 Z A a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 Z A a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_27_74# TE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 Z A a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_27_368# a_802_323# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_27_368# a_802_323# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 Z A a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 Z A a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VGND TE a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_802_323# TE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_27_74# A Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 VGND TE a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 Z A a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_802_323# TE VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_27_368# A Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_27_368# a_802_323# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 Z A a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 a_27_74# TE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 VPWR a_802_323# a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 Z A a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 VPWR a_802_323# a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X30 a_27_368# A Z VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X31 a_27_74# A Z VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X32 VGND TE a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 VPWR a_802_323# a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/fa/sky130_fd_sc_ms__fa_1.cdl b/cells/fa/sky130_fd_sc_ms__fa_1.cdl
index 39038f6..36e6a48 100644
--- a/cells/fa/sky130_fd_sc_ms__fa_1.cdl
+++ b/cells/fa/sky130_fd_sc_ms__fa_1.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_ms__fa_1 A B CIN VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I CIN:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMNs1s nint1 majb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNs1s nint1 majb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 COUT majb VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 SUM sumb VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj10 majb B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj11 sndNAp1 A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMIN2 COUT majb VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj30 majb CIN VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMIN3 SUM sumb VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj31 sndNCINn3 B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNmaj10 majb B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj20 VGND A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs2s0 VGND A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs2s1 sndNAn4 B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNmaj11 sndNAp1 A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs2s2 sndNBn4 CIN VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNmaj30 majb CIN VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs3s0 nint1 B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs3s1 nint1 A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs3s2 nint1 CIN VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNmaj31 sndNCINn3 B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNmaj20 VGND A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 COUT majb VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 SUM sumb VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj10 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj11 sndPAp1 B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNs2s0 VGND A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj20 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj21 sndPCINp3 CIN VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNs2s1 sndNAn4 B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj31 sndPCINp3 B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNs2s2 sndNBn4 CIN VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs3s0 nint1 B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs2s0 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs2s1 sndPAp4 B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs2s2 sndPBp4 CIN VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNs3s1 nint1 A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs3s0 pint1 B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNs3s2 nint1 CIN VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 COUT majb VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 SUM sumb VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj10 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj11 sndPAp1 B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj20 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj21 sndPCINp3 CIN VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj31 sndPCINp3 B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs2s0 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs3s1 pint1 A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs3s2 pint1 CIN VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs1s pint1 majb VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs2s1 sndPAp4 B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs2s2 sndPBp4 CIN VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs3s0 pint1 B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs3s1 pint1 A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs3s2 pint1 CIN VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs1s pint1 majb VPB pfet_01v8 m=1 w=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_ms__fa_1
diff --git a/cells/fa/sky130_fd_sc_ms__fa_1.netlist.tsv b/cells/fa/sky130_fd_sc_ms__fa_1.netlist.tsv
index cba3152..a10ffa8 100644
--- a/cells/fa/sky130_fd_sc_ms__fa_1.netlist.tsv
+++ b/cells/fa/sky130_fd_sc_ms__fa_1.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_ms__fa_1	A:I B:I CIN:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNs1s	MOSFET	nint1	majb	sumb	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	COUT	majb	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj30	MOSFET	majb	CIN	sndNCINn3	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj31	MOSFET	sndNCINn3	B	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj20	MOSFET	VGND	A	sndNCINn3	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s0	MOSFET	nint1	B	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s1	MOSFET	nint1	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj20	MOSFET	VPWR	A	sndPCINp3	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj21	MOSFET	sndPCINp3	CIN	majb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj31	MOSFET	sndPCINp3	B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s0	MOSFET	pint1	B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s1	MOSFET	pint1	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1s	MOSFET	pint1	majb	sumb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1s	MOSFET	nint1	majb	sumb	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj30	MOSFET	majb	CIN	sndNCINn3	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj31	MOSFET	sndNCINn3	B	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj20	MOSFET	VGND	A	sndNCINn3	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s0	MOSFET	nint1	B	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s1	MOSFET	nint1	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	majb	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj20	MOSFET	VPWR	A	sndPCINp3	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj21	MOSFET	sndPCINp3	CIN	majb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj31	MOSFET	sndPCINp3	B	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s0	MOSFET	pint1	B	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s1	MOSFET	pint1	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1s	MOSFET	pint1	majb	sumb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/fa/sky130_fd_sc_ms__fa_1.spice b/cells/fa/sky130_fd_sc_ms__fa_1.spice
index 1b2cd90..e29ac15 100644
--- a/cells/fa/sky130_fd_sc_ms__fa_1.spice
+++ b/cells/fa/sky130_fd_sc_ms__fa_1.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__fa_1 A B CIN VGND VNB VPB VPWR COUT SUM
-M1000 a_315_75# B a_237_75# VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.536e+11p ps=1.76e+06u
-M1001 a_69_260# CIN a_315_75# VNB nlowvt w=640000u l=150000u
-+  ad=2.496e+11p pd=2.06e+06u as=0p ps=0u
-M1002 a_936_75# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.65875e+12p ps=1.244e+07u
-M1003 a_321_389# B a_220_368# VPB pshort w=1e+06u l=180000u
-+  ad=3.6175e+11p pd=3.07e+06u as=3.43375e+11p ps=2.86e+06u
-M1004 a_69_260# CIN a_321_389# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1005 VPWR CIN a_512_347# VPB pshort w=1e+06u l=180000u
-+  ad=2.0852e+12p pd=1.495e+07u as=6.3e+11p ps=5.26e+06u
-M1006 a_512_347# a_465_249# a_69_260# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 COUT a_465_249# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1008 VGND CIN a_501_75# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=4.096e+11p ps=3.84e+06u
-M1009 a_1110_347# B VPWR VPB pshort w=1e+06u l=180000u
-+  ad=7.35e+11p pd=5.47e+06u as=0p ps=0u
-M1010 a_501_75# a_465_249# a_69_260# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_237_75# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_512_347# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_465_249# B a_919_347# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=3.25e+11p ps=2.65e+06u
-M1014 VGND B a_501_75# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1100_75# B VGND VNB nlowvt w=640000u l=150000u
-+  ad=8.888e+11p pd=5.27e+06u as=0p ps=0u
-M1016 a_501_75# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_465_249# B a_936_75# VNB nlowvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1018 COUT a_465_249# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.998e+11p pd=2.02e+06u as=0p ps=0u
-M1019 a_919_347# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1110_347# CIN a_465_249# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_69_260# SUM VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.024e+11p ps=2.78e+06u
-M1022 VPWR A a_1110_347# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A a_1100_75# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1100_75# CIN a_465_249# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR B a_512_347# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_69_260# SUM VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1027 a_220_368# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_465_249# COUT VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_512_347# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VGND A a_936_75# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_315_75# CIN a_69_260# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 VPWR A a_512_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_512_347# CIN VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_237_75# B a_315_75# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X7 a_1110_347# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 VPWR a_465_249# COUT VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_69_260# a_465_249# a_501_75# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 VPWR B a_1110_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_69_260# a_465_249# a_512_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 VGND B a_1100_75# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 VPWR A a_919_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 a_465_249# CIN a_1100_75# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 a_919_347# B a_465_249# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 a_465_249# CIN a_1110_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X17 VGND A a_237_75# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X18 a_220_368# B a_321_389# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X19 VPWR A a_220_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X20 a_1100_75# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X21 a_321_389# CIN a_69_260# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X22 a_501_75# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X23 a_936_75# B a_465_249# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X24 a_501_75# CIN VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X25 VGND A a_501_75# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X26 SUM a_69_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 SUM a_69_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/fa/sky130_fd_sc_ms__fa_2.cdl b/cells/fa/sky130_fd_sc_ms__fa_2.cdl
index 730e775..d22b8c9 100644
--- a/cells/fa/sky130_fd_sc_ms__fa_2.cdl
+++ b/cells/fa/sky130_fd_sc_ms__fa_2.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_ms__fa_2 A B CIN VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I CIN:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMNs1s nint1 majb VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNs1s nint1 majb VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 COUT majb VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 SUM sumb VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj10 majb B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj11 sndNAp1 A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMIN2 COUT majb VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj30 majb CIN VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMIN3 SUM sumb VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj21 nmajmid A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNmaj10 majb B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj20 VGND B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs2s0 VGND A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs2s1 sndNAn4 B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNmaj11 sndNAp1 A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs2s2 sndNBn4 CIN VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNmaj30 majb CIN VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs3s0 nint1 A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs3s1 nint1 B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs3s2 nint1 CIN VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNmaj21 nmajmid A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 COUT majb VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 SUM sumb VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj10 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj11 sndPAp1 B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNmaj20 VGND B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj20 VPWR B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj30 pmajmid CIN VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNs2s0 VGND A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj21 pmajmid A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNs2s1 sndNAn4 B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs2s0 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs2s1 sndPAp4 B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs2s2 sndPBp4 CIN VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNs2s2 sndNBn4 CIN VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs3s0 nint1 A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs3s0 pint1 A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNs3s1 nint1 B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs3s2 nint1 CIN VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 COUT majb VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 SUM sumb VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj10 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj11 sndPAp1 B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj20 VPWR B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj30 pmajmid CIN VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj21 pmajmid A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs2s0 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs3s1 pint1 B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs3s2 pint1 CIN VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs1s pint1 majb VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs2s1 sndPAp4 B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs2s2 sndPBp4 CIN VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs3s0 pint1 A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs3s1 pint1 B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs3s2 pint1 CIN VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs1s pint1 majb VPB pfet_01v8 m=1 w=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_ms__fa_2
diff --git a/cells/fa/sky130_fd_sc_ms__fa_2.netlist.tsv b/cells/fa/sky130_fd_sc_ms__fa_2.netlist.tsv
index 14645c0..7b8d23a 100644
--- a/cells/fa/sky130_fd_sc_ms__fa_2.netlist.tsv
+++ b/cells/fa/sky130_fd_sc_ms__fa_2.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_ms__fa_2	A:I B:I CIN:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNs1s	MOSFET	nint1	majb	sumb	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	COUT	majb	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj30	MOSFET	majb	CIN	nmajmid	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj21	MOSFET	nmajmid	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj20	MOSFET	VGND	B	nmajmid	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s0	MOSFET	nint1	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s1	MOSFET	nint1	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj20	MOSFET	VPWR	B	pmajmid	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj30	MOSFET	pmajmid	CIN	majb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj21	MOSFET	pmajmid	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s0	MOSFET	pint1	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s1	MOSFET	pint1	B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1s	MOSFET	pint1	majb	sumb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1s	MOSFET	nint1	majb	sumb	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj30	MOSFET	majb	CIN	nmajmid	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj21	MOSFET	nmajmid	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj20	MOSFET	VGND	B	nmajmid	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s0	MOSFET	nint1	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s1	MOSFET	nint1	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	majb	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj20	MOSFET	VPWR	B	pmajmid	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj30	MOSFET	pmajmid	CIN	majb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj21	MOSFET	pmajmid	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s0	MOSFET	pint1	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s1	MOSFET	pint1	B	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1s	MOSFET	pint1	majb	sumb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/fa/sky130_fd_sc_ms__fa_2.spice b/cells/fa/sky130_fd_sc_ms__fa_2.spice
index 4c3b784..62614d8 100644
--- a/cells/fa/sky130_fd_sc_ms__fa_2.spice
+++ b/cells/fa/sky130_fd_sc_ms__fa_2.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ms__fa_2 A B CIN VGND VNB VPB VPWR COUT SUM
-M1000 VPWR B a_686_347# VPB pshort w=1e+06u l=180000u
-+  ad=2.63765e+12p pd=1.825e+07u as=6.22125e+11p ps=5.5e+06u
-M1001 a_995_347# a_339_347# a_701_79# VNB nlowvt w=740000u l=150000u
-+  ad=2.59e+11p pd=2.18e+06u as=5.18e+11p ps=4.36e+06u
-M1002 a_1205_79# B a_1119_79# VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=2.072e+11p ps=2.04e+06u
-M1003 VGND A a_1205_79# VNB nlowvt w=740000u l=150000u
-+  ad=2.36723e+12p pd=1.592e+07u as=0p ps=0u
-M1004 COUT a_339_347# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1005 a_27_79# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=6.327e+11p pd=4.67e+06u as=0p ps=0u
-M1006 SUM a_995_347# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1007 COUT a_339_347# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=4.088e+11p pd=2.97e+06u as=0p ps=0u
-M1008 VPWR A a_1205_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1009 a_686_347# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_339_347# COUT VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 SUM a_995_347# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1012 VGND a_339_347# COUT VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_27_378# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.5e+11p ps=5.1e+06u
-M1014 a_27_378# B VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_995_347# SUM VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_995_347# a_339_347# a_686_347# VPB pshort w=1e+06u l=180000u
-+  ad=3.3e+11p pd=2.66e+06u as=0p ps=0u
-M1017 VPWR a_995_347# SUM VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND B a_701_79# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_339_347# CIN a_27_378# VPB pshort w=1e+06u l=180000u
-+  ad=5.6e+11p pd=3.12e+06u as=0p ps=0u
-M1020 a_1097_347# CIN a_995_347# VPB pshort w=1e+06u l=180000u
-+  ad=3.747e+11p pd=2.93e+06u as=0p ps=0u
-M1021 a_701_79# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_487_347# B a_339_347# VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1023 VGND A a_27_79# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1119_79# CIN a_995_347# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR A a_487_347# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_686_347# CIN VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A a_487_79# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1028 a_487_79# B a_339_347# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.59e+11p ps=2.18e+06u
-M1029 a_1205_368# B a_1097_347# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_339_347# CIN a_27_79# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_701_79# CIN VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_487_347# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_27_79# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VGND CIN a_701_79# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_1097_347# B a_1205_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VGND A a_701_79# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_686_347# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 SUM a_995_347# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND a_339_347# COUT VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_27_378# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 a_701_79# a_339_347# a_995_347# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_995_347# CIN a_1097_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 VPWR B a_27_378# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 VGND B a_27_79# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_686_347# a_339_347# a_995_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 VPWR CIN a_686_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X15 COUT a_339_347# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 VGND a_995_347# SUM VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_995_347# CIN a_1119_79# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_487_79# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_339_347# B a_487_79# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 VPWR a_995_347# SUM VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 a_1205_79# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 a_1205_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X23 a_1119_79# B a_1205_79# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 SUM a_995_347# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 VPWR a_339_347# COUT VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 a_27_79# CIN a_339_347# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 a_339_347# B a_487_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X28 VPWR A a_686_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X29 a_27_378# CIN a_339_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X30 COUT a_339_347# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X31 a_701_79# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/fa/sky130_fd_sc_ms__fa_4.cdl b/cells/fa/sky130_fd_sc_ms__fa_4.cdl
index 20c1b30..4a008b0 100644
--- a/cells/fa/sky130_fd_sc_ms__fa_4.cdl
+++ b/cells/fa/sky130_fd_sc_ms__fa_4.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_ms__fa_4 A B CIN VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I CIN:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMNs1s nint1 majb VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNs1s nint1 majb VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 COUT majb VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 SUM sumb VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj10 majb B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj11 sndNAp1 A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMIN2 COUT majb VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj30 majb CIN VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMIN3 SUM sumb VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj21 nmajmid A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNmaj10 majb B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj20 VGND B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs2s0 VGND A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs2s1 sndNAn4 B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNmaj11 sndNAp1 A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs2s2 sndNBn4 CIN VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNmaj30 majb CIN VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs3s0 nint1 A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs3s1 nint1 B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs3s2 nint1 CIN VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNmaj21 nmajmid A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 COUT majb VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 SUM sumb VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj10 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj11 sndPAp1 B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNmaj20 VGND B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj20 VPWR B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj30 pmajmid CIN VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNs2s0 VGND A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj21 pmajmid A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNs2s1 sndNAn4 B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs2s0 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs2s1 sndPAp4 B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs2s2 sndPBp4 CIN VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNs2s2 sndNBn4 CIN VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs3s0 nint1 A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs3s0 pint1 A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMNs3s1 nint1 B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs3s2 nint1 CIN VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 COUT majb VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 SUM sumb VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj10 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj11 sndPAp1 B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj20 VPWR B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj30 pmajmid CIN VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj21 pmajmid A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs2s0 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs3s1 pint1 B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs3s2 pint1 CIN VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs1s pint1 majb VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs2s1 sndPAp4 B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs2s2 sndPBp4 CIN VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs3s0 pint1 A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs3s1 pint1 B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs3s2 pint1 CIN VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs1s pint1 majb VPB pfet_01v8 m=1 w=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_ms__fa_4
diff --git a/cells/fa/sky130_fd_sc_ms__fa_4.netlist.tsv b/cells/fa/sky130_fd_sc_ms__fa_4.netlist.tsv
index d7667ca..3539a25 100644
--- a/cells/fa/sky130_fd_sc_ms__fa_4.netlist.tsv
+++ b/cells/fa/sky130_fd_sc_ms__fa_4.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_ms__fa_4	A:I B:I CIN:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNs1s	MOSFET	nint1	majb	sumb	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	COUT	majb	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj30	MOSFET	majb	CIN	nmajmid	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj21	MOSFET	nmajmid	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj20	MOSFET	VGND	B	nmajmid	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s0	MOSFET	nint1	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s1	MOSFET	nint1	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj20	MOSFET	VPWR	B	pmajmid	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj30	MOSFET	pmajmid	CIN	majb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj21	MOSFET	pmajmid	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s0	MOSFET	pint1	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s1	MOSFET	pint1	B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1s	MOSFET	pint1	majb	sumb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1s	MOSFET	nint1	majb	sumb	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj30	MOSFET	majb	CIN	nmajmid	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj21	MOSFET	nmajmid	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj20	MOSFET	VGND	B	nmajmid	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s0	MOSFET	nint1	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s1	MOSFET	nint1	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	majb	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj20	MOSFET	VPWR	B	pmajmid	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj30	MOSFET	pmajmid	CIN	majb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj21	MOSFET	pmajmid	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s0	MOSFET	pint1	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s1	MOSFET	pint1	B	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1s	MOSFET	pint1	majb	sumb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/fa/sky130_fd_sc_ms__fa_4.spice b/cells/fa/sky130_fd_sc_ms__fa_4.spice
index cd25ae1..e308ac0 100644
--- a/cells/fa/sky130_fd_sc_ms__fa_4.spice
+++ b/cells/fa/sky130_fd_sc_ms__fa_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ms__fa_4 A B CIN VGND VNB VPB VPWR COUT SUM
-M1000 VPWR a_418_74# COUT VPB pshort w=1.12e+06u l=180000u
-+  ad=2.97415e+12p pd=2.322e+07u as=6.048e+11p ps=5.56e+06u
-M1001 a_418_74# CIN a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=4.181e+11p ps=4.09e+06u
-M1002 VGND A a_1238_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.9966e+12p pd=2.115e+07u as=2.664e+11p ps=2.2e+06u
-M1003 VPWR A a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.23132e+12p ps=6.6e+06u
-M1004 a_740_347# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.9e+11p pd=5.18e+06u as=0p ps=0u
-M1005 VPWR A a_538_347# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.3e+11p ps=2.66e+06u
-M1006 a_740_347# CIN VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 SUM a_1024_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1008 SUM a_1024_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1144_347# CIN a_1024_74# VPB pshort w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=3.2e+11p ps=2.64e+06u
-M1010 VPWR a_1024_74# SUM VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 COUT a_418_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1012 VPWR B a_740_347# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1024_74# a_418_74# a_740_347# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_418_74# COUT VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_734_74# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1016 a_1024_74# a_418_74# a_734_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.922e+11p pd=2.54e+06u as=0p ps=0u
-M1017 a_27_392# B VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A a_1238_347# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.747e+11p ps=2.93e+06u
-M1019 COUT a_418_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_1024_74# SUM VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 COUT a_418_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_1024_74# SUM VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1023 VPWR a_418_74# COUT VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 SUM a_1024_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 COUT a_418_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_532_74# B a_418_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=0p ps=0u
-M1027 a_418_74# CIN a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1028 a_1160_74# CIN a_1024_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1029 a_538_347# B a_418_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_74# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1238_347# B a_1144_347# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_734_74# CIN VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND B a_734_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND A a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND A a_532_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND a_1024_74# SUM VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND a_418_74# COUT VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 SUM a_1024_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_1238_74# B a_1160_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_392# CIN a_418_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VGND CIN a_734_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_734_74# a_418_74# a_1024_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_740_347# a_418_74# a_1024_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VGND A a_734_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VPWR a_1024_74# SUM VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 COUT a_418_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR a_418_74# COUT VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 SUM a_1024_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_1024_74# CIN a_1160_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VPWR A a_740_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 a_1024_74# CIN a_1144_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 VPWR a_1024_74# SUM VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VPWR a_418_74# COUT VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_538_347# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 COUT a_418_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VPWR B a_27_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 VGND a_1024_74# SUM VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 COUT a_418_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 VGND a_418_74# COUT VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 a_418_74# B a_538_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X22 VPWR CIN a_740_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X23 a_1144_347# B a_1238_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X24 a_1238_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 a_740_347# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X26 SUM a_1024_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 SUM a_1024_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 a_418_74# B a_532_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_1160_74# B a_1238_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X30 a_1238_347# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X31 a_27_74# CIN a_418_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X32 a_532_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 VGND a_1024_74# SUM VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 VGND a_418_74# COUT VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X35 SUM a_1024_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X36 COUT a_418_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X37 a_27_392# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X38 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X39 a_734_74# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/fah/sky130_fd_sc_ms__fah_1.cdl b/cells/fah/sky130_fd_sc_ms__fah_1.cdl
index e21ff2b..7b02066 100644
--- a/cells/fah/sky130_fd_sc_ms__fah_1.cdl
+++ b/cells/fah/sky130_fd_sc_ms__fah_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ms__fah_1 A B CI VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I CI:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMIN2 COUT net143 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMIN2 COUT net143 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 SUM net87 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 CIb mid2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 Bb mid1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 CIbb mid2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 CIb mid1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 CIbb CIb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 CIb CI VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Ab2 A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Abb2 Ab2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 Ab1 A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 Abb2 B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 Ab1 Bb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Abb2 Bb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Ab1 B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 COUT net143 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MMIN3 SUM net87 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 SUM net87 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI6 CIb mid2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 Bb mid1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 CIbb mid2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 CIb mid1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 Bb B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 CIb mid1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI46 CIbb CIb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 CIb CI VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 Ab2 A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI3 Bb mid2 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI9 Abb2 Ab2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 Ab1 A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 Abb2 B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI21 Ab1 Bb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 Abb2 Bb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 Ab1 B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 COUT net143 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 SUM net87 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 CIb mid1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 CIbb mid1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI3 Bb mid2 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 CIb mid2 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI1 CIbb mid1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 CIb mid2 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 Bb B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 CIbb CIb VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI47 CIbb CIb VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 CIb CI VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI45 CIb CI VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 Ab2 A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI12 Ab2 A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Abb2 Ab2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI13 Abb2 Ab2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 Ab1 A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI19 Ab1 A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 Abb2 Bb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI22 Abb2 Bb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 Ab1 B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI23 Ab1 B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 Abb2 B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI26 Abb2 B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 Ab1 Bb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI27 Ab1 Bb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__fah_1
diff --git a/cells/fah/sky130_fd_sc_ms__fah_1.netlist.tsv b/cells/fah/sky130_fd_sc_ms__fah_1.netlist.tsv
index 1847f27..8362508 100644
--- a/cells/fah/sky130_fd_sc_ms__fah_1.netlist.tsv
+++ b/cells/fah/sky130_fd_sc_ms__fah_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ms__fah_1	A:I B:I CI:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN2	MOSFET	COUT	net143	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	net87	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	CIb	mid2	net143	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	Bb	mid1	net143	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	CIbb	mid2	net87	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	CIb	mid1	net87	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	CIbb	CIb	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	CIb	CI	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Ab2	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Abb2	Ab2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	Ab1	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	Abb2	B	mid1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	Ab1	Bb	mid1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Abb2	Bb	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Ab1	B	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	net143	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	net87	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	CIb	mid1	net143	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	Bb	mid2	net143	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	CIbb	mid1	net87	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	CIb	mid2	net87	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	CIbb	CIb	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	CIb	CI	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab2	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Abb2	Ab2	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	Ab1	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	Abb2	Bb	mid1	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	Ab1	B	mid1	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	Abb2	B	mid2	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	Ab1	Bb	mid2	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	net143	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	net87	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	CIb	mid2	net143	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	Bb	mid1	net143	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	CIbb	mid2	net87	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	CIb	mid1	net87	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	CIbb	CIb	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	CIb	CI	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Ab2	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Abb2	Ab2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	Ab1	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	Abb2	B	mid1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	Ab1	Bb	mid1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Abb2	Bb	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Ab1	B	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	net143	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	net87	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	CIb	mid1	net143	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	Bb	mid2	net143	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	CIbb	mid1	net87	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	CIb	mid2	net87	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	CIbb	CIb	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	CIb	CI	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab2	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Abb2	Ab2	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	Ab1	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	Abb2	Bb	mid1	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	Ab1	B	mid1	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	Abb2	B	mid2	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	Ab1	Bb	mid2	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/fah/sky130_fd_sc_ms__fah_1.spice b/cells/fah/sky130_fd_sc_ms__fah_1.spice
index 8b9dbca..99d07f4 100644
--- a/cells/fah/sky130_fd_sc_ms__fah_1.spice
+++ b/cells/fah/sky130_fd_sc_ms__fah_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ms__fah_1 A B CI VGND VNB VPB VPWR COUT SUM
-M1000 a_231_132# CI VPWR VPB pshort w=1e+06u l=180000u
-+  ad=1.06802e+12p pd=6.52e+06u as=2.27012e+12p ps=1.57e+07u
-M1001 a_410_58# a_811_379# a_879_55# VNB nlowvt w=640000u l=150000u
-+  ad=2.6395e+11p pd=2.41e+06u as=4.9405e+11p ps=5.22e+06u
-M1002 a_83_21# a_811_379# a_231_132# VNB nlowvt w=640000u l=150000u
-+  ad=2.375e+11p pd=2.16e+06u as=3.808e+11p ps=3.75e+06u
-M1003 a_644_104# a_231_132# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.31125e+11p pd=3.21e+06u as=0p ps=0u
-M1004 a_811_379# a_879_55# a_1852_374# VNB nlowvt w=640000u l=150000u
-+  ad=6.528e+11p pd=3.32e+06u as=5.128e+11p ps=4.25e+06u
-M1005 a_1023_379# a_879_55# a_1852_374# VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=1.57615e+12p ps=7.29e+06u
-M1006 a_1023_379# a_879_55# a_1660_374# VNB nlowvt w=640000u l=150000u
-+  ad=4.965e+11p pd=2.98e+06u as=5.157e+11p ps=4.37e+06u
-M1007 VPWR a_410_58# COUT VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=4.5085e+11p ps=3.26e+06u
-M1008 VGND a_410_58# COUT VNB nlowvt w=740000u l=150000u
-+  ad=1.8144e+12p pd=1.292e+07u as=2.072e+11p ps=2.04e+06u
-M1009 a_1660_374# B a_1023_379# VPB pshort w=840000u l=180000u
-+  ad=5.782e+11p pd=5.13e+06u as=0p ps=0u
-M1010 a_410_58# a_811_379# a_231_132# VPB pshort w=840000u l=180000u
-+  ad=4.83e+11p pd=2.83e+06u as=0p ps=0u
-M1011 a_1852_374# B a_811_379# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.688e+11p ps=2.32e+06u
-M1012 a_231_132# CI VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_811_379# a_879_55# a_1660_374# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_2342_48# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1015 VPWR a_83_21# SUM VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1016 a_231_132# a_1023_379# a_410_58# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_83_21# a_811_379# a_644_104# VPB pshort w=840000u l=180000u
-+  ad=7.392e+11p pd=3.44e+06u as=0p ps=0u
-M1018 VGND A a_1852_374# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_879_55# a_1023_379# a_410_58# VPB pshort w=840000u l=180000u
-+  ad=3.742e+11p pd=2.95e+06u as=0p ps=0u
-M1020 a_644_104# a_1023_379# a_83_21# VNB nlowvt w=640000u l=150000u
-+  ad=4.1745e+11p pd=3.87e+06u as=0p ps=0u
-M1021 VPWR B a_879_55# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_2342_48# a_1660_374# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND B a_879_55# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1660_374# B a_811_379# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_644_104# a_231_132# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_83_21# SUM VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1027 a_1852_374# B a_1023_379# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_231_132# a_1023_379# a_83_21# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_2342_48# a_1660_374# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A a_1852_374# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_2342_48# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
+X0 a_1852_374# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_1852_374# a_879_55# a_811_379# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_879_55# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_83_21# a_1023_379# a_231_132# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X4 a_231_132# a_811_379# a_83_21# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_1660_374# a_879_55# a_1023_379# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 a_1023_379# B a_1852_374# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X7 a_1852_374# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_231_132# a_811_379# a_410_58# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 a_410_58# a_1023_379# a_231_132# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 VPWR A a_2342_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_1023_379# B a_1660_374# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X12 a_1660_374# a_879_55# a_811_379# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X13 a_1660_374# a_2342_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VGND a_231_132# a_644_104# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 a_879_55# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VGND A a_2342_48# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 a_879_55# a_811_379# a_410_58# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X18 SUM a_83_21# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_410_58# a_1023_379# a_879_55# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X20 a_811_379# B a_1852_374# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X21 a_811_379# B a_1660_374# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X22 SUM a_83_21# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 COUT a_410_58# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_83_21# a_1023_379# a_644_104# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X25 VPWR a_231_132# a_644_104# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X26 a_1660_374# a_2342_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 a_1852_374# a_879_55# a_1023_379# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X28 a_644_104# a_811_379# a_83_21# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X29 VPWR CI a_231_132# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X30 VGND CI a_231_132# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X31 COUT a_410_58# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/fah/sky130_fd_sc_ms__fah_2.cdl b/cells/fah/sky130_fd_sc_ms__fah_2.cdl
index a157eab..b7414a5 100644
--- a/cells/fah/sky130_fd_sc_ms__fah_2.cdl
+++ b/cells/fah/sky130_fd_sc_ms__fah_2.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ms__fah_2 A B CI VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I CI:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMIN2 COUT net143 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
+MMIN2 COUT net143 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 SUM net87 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 CIb mid2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 Bb mid1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 CIbb mid2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 CIb mid1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 CIbb CIb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 CIb CI VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Ab2 A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Abb2 Ab2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 Ab1 A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 Abb2 B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 Ab1 Bb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Abb2 Bb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Ab1 B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 COUT net143 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265
+MMIN3 SUM net87 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 SUM net87 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI6 CIb mid2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 Bb mid1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 CIbb mid2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 CIb mid1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 Bb B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 CIb mid1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI46 CIbb CIb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 CIb CI VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 Ab2 A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI3 Bb mid2 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI9 Abb2 Ab2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 Ab1 A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 Abb2 B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI21 Ab1 Bb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 Abb2 Bb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 Ab1 B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 COUT net143 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 SUM net87 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 CIb mid1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 CIbb mid1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI3 Bb mid2 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 CIb mid2 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI1 CIbb mid1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 CIb mid2 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 Bb B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 CIbb CIb VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI47 CIbb CIb VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 CIb CI VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI45 CIb CI VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 Ab2 A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI12 Ab2 A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Abb2 Ab2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI13 Abb2 Ab2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 Ab1 A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI19 Ab1 A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 Abb2 Bb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI22 Abb2 Bb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 Ab1 B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI23 Ab1 B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 Abb2 B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI26 Abb2 B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 Ab1 Bb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI27 Ab1 Bb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__fah_2
diff --git a/cells/fah/sky130_fd_sc_ms__fah_2.netlist.tsv b/cells/fah/sky130_fd_sc_ms__fah_2.netlist.tsv
index b48bf3d..45fdedf 100644
--- a/cells/fah/sky130_fd_sc_ms__fah_2.netlist.tsv
+++ b/cells/fah/sky130_fd_sc_ms__fah_2.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ms__fah_2	A:I B:I CI:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN2	MOSFET	COUT	net143	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	net87	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	CIb	mid2	net143	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	Bb	mid1	net143	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	CIbb	mid2	net87	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	CIb	mid1	net87	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	CIbb	CIb	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	CIb	CI	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Ab2	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Abb2	Ab2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	Ab1	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	Abb2	B	mid1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	Ab1	Bb	mid1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Abb2	Bb	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Ab1	B	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	net143	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	net87	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	CIb	mid1	net143	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	Bb	mid2	net143	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	CIbb	mid1	net87	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	CIb	mid2	net87	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	CIbb	CIb	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	CIb	CI	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab2	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Abb2	Ab2	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	Ab1	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	Abb2	Bb	mid1	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	Ab1	B	mid1	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	Abb2	B	mid2	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	Ab1	Bb	mid2	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	net143	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	net87	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	CIb	mid2	net143	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	Bb	mid1	net143	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	CIbb	mid2	net87	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	CIb	mid1	net87	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	CIbb	CIb	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	CIb	CI	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Ab2	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Abb2	Ab2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	Ab1	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	Abb2	B	mid1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	Ab1	Bb	mid1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Abb2	Bb	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Ab1	B	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	net143	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	net87	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	CIb	mid1	net143	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	Bb	mid2	net143	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	CIbb	mid1	net87	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	CIb	mid2	net87	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	CIbb	CIb	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	CIb	CI	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab2	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Abb2	Ab2	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	Ab1	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	Abb2	Bb	mid1	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	Ab1	B	mid1	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	Abb2	B	mid2	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	Ab1	Bb	mid2	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/fah/sky130_fd_sc_ms__fah_2.spice b/cells/fah/sky130_fd_sc_ms__fah_2.spice
index 7ec4acb..efdd4e0 100644
--- a/cells/fah/sky130_fd_sc_ms__fah_2.spice
+++ b/cells/fah/sky130_fd_sc_ms__fah_2.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_ms__fah_2 A B CI VGND VNB VPB VPWR COUT SUM
-M1000 a_416_392# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=4.247e+11p pd=4.22e+06u as=1.82425e+12p ps=1.593e+07u
-M1001 COUT a_1454_424# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=2.404e+12p ps=1.999e+07u
-M1002 a_852_424# a_481_379# a_117_368# VPB pshort w=840000u l=180000u
-+  ad=1.1046e+12p pd=4.31e+06u as=6.58e+11p ps=5.31e+06u
-M1003 a_517_424# B a_416_392# VNB nlowvt w=640000u l=150000u
-+  ad=3.904e+11p pd=2.5e+06u as=0p ps=0u
-M1004 a_852_424# B a_117_368# VNB nlowvt w=640000u l=150000u
-+  ad=4.448e+11p pd=2.67e+06u as=7.401e+11p ps=4.99e+06u
-M1005 a_117_368# a_481_379# a_517_424# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_1454_424# COUT VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_1898_424# SUM VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1008 a_1898_424# a_852_424# a_1692_424# VNB nlowvt w=640000u l=150000u
-+  ad=4.729e+11p pd=2.9e+06u as=6.112e+11p ps=4.47e+06u
-M1009 SUM a_1898_424# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_1692_424# a_2055_424# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.688e+11p ps=2.12e+06u
-M1011 COUT a_1454_424# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1012 VGND A a_81_260# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.272e+11p ps=1.99e+06u
-M1013 a_1454_424# a_852_424# a_481_379# VNB nlowvt w=640000u l=150000u
-+  ad=5.6e+11p pd=3.03e+06u as=2.33e+11p ps=2.13e+06u
-M1014 a_416_392# B a_852_424# VPB pshort w=840000u l=180000u
-+  ad=5.398e+11p pd=4.87e+06u as=0p ps=0u
-M1015 a_1692_424# a_517_424# a_1454_424# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1898_424# a_517_424# a_1692_424# VPB pshort w=840000u l=180000u
-+  ad=5.082e+11p pd=2.89e+06u as=9.84e+11p ps=5.92e+06u
-M1017 a_1692_424# CI VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_1898_424# SUM VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.146e+11p ps=2.06e+06u
-M1019 a_416_392# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_1692_424# a_2055_424# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=4.642e+11p ps=3.01e+06u
-M1021 a_1454_424# a_517_424# a_481_379# VPB pshort w=840000u l=180000u
-+  ad=8.484e+11p pd=3.7e+06u as=3.654e+11p ps=2.93e+06u
-M1022 a_2055_424# a_852_424# a_1898_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1692_424# CI VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_117_368# a_81_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_481_379# B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1692_424# a_852_424# a_1454_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_416_392# a_481_379# a_852_424# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_2055_424# a_517_424# a_1898_424# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A a_81_260# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1030 a_517_424# a_481_379# a_416_392# VPB pshort w=840000u l=180000u
-+  ad=7.434e+11p pd=3.45e+06u as=0p ps=0u
-M1031 SUM a_1898_424# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_117_368# B a_517_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_481_379# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_117_368# a_81_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_1454_424# COUT VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1692_424# a_852_424# a_1898_424# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 a_852_424# a_481_379# a_416_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 VPWR a_1454_424# COUT VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_1898_424# a_852_424# a_2055_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X4 a_2055_424# a_1692_424# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 VPWR a_1898_424# SUM VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VPWR A a_416_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VPWR CI a_1692_424# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 VGND CI a_1692_424# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_517_424# B a_117_368# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X10 a_852_424# B a_416_392# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X11 VPWR B a_481_379# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_117_368# B a_852_424# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 a_481_379# a_517_424# a_1454_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X14 VGND A a_416_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 VGND B a_481_379# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 SUM a_1898_424# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_81_260# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X18 VGND a_1898_424# SUM VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_1898_424# a_517_424# a_2055_424# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X20 a_481_379# a_852_424# a_1454_424# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X21 a_416_392# B a_517_424# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X22 COUT a_1454_424# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 COUT a_1454_424# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_1692_424# a_517_424# a_1898_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X25 VGND a_81_260# a_117_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 a_416_392# a_481_379# a_517_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X27 VGND a_1454_424# COUT VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 a_1454_424# a_517_424# a_1692_424# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X29 a_2055_424# a_1692_424# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X30 a_81_260# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X31 a_1454_424# a_852_424# a_1692_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X32 a_517_424# a_481_379# a_117_368# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X33 a_117_368# a_481_379# a_852_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X34 SUM a_1898_424# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X35 VPWR a_81_260# a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/fah/sky130_fd_sc_ms__fah_4.cdl b/cells/fah/sky130_fd_sc_ms__fah_4.cdl
index f174672..a6ac69b 100644
--- a/cells/fah/sky130_fd_sc_ms__fah_4.cdl
+++ b/cells/fah/sky130_fd_sc_ms__fah_4.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ms__fah_4 A B CI VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I CI:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMIN2 COUT net143 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
+MMIN2 COUT net143 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 SUM net87 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 CIb mid2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 Bb mid1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 CIbb mid2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 CIb mid1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 CIbb CIb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 CIb CI VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Ab2 A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Abb2 Ab2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 Ab1 A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 Abb2 B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 Ab1 Bb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Abb2 Bb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Ab1 B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 COUT net143 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265
+MMIN3 SUM net87 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 SUM net87 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI6 CIb mid2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 Bb mid1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 CIbb mid2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 CIb mid1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 Bb B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 CIb mid1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI46 CIbb CIb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 CIb CI VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 Ab2 A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI3 Bb mid2 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI9 Abb2 Ab2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 Ab1 A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 Abb2 B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI21 Ab1 Bb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 Abb2 Bb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 Ab1 B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 COUT net143 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 SUM net87 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 CIb mid1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 CIbb mid1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI3 Bb mid2 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 CIb mid2 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI1 CIbb mid1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 CIb mid2 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 Bb B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 CIbb CIb VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI47 CIbb CIb VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 CIb CI VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI45 CIb CI VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 Ab2 A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI12 Ab2 A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Abb2 Ab2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI13 Abb2 Ab2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 Ab1 A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI19 Ab1 A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 Abb2 Bb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI22 Abb2 Bb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 Ab1 B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI23 Ab1 B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 Abb2 B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI26 Abb2 B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 Ab1 Bb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI27 Ab1 Bb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__fah_4
diff --git a/cells/fah/sky130_fd_sc_ms__fah_4.netlist.tsv b/cells/fah/sky130_fd_sc_ms__fah_4.netlist.tsv
index 2a63787..c7693d7 100644
--- a/cells/fah/sky130_fd_sc_ms__fah_4.netlist.tsv
+++ b/cells/fah/sky130_fd_sc_ms__fah_4.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ms__fah_4	A:I B:I CI:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN2	MOSFET	COUT	net143	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	net87	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	CIb	mid2	net143	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	Bb	mid1	net143	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	CIbb	mid2	net87	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	CIb	mid1	net87	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	CIbb	CIb	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	CIb	CI	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Ab2	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Abb2	Ab2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	Ab1	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	Abb2	B	mid1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	Ab1	Bb	mid1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Abb2	Bb	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Ab1	B	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	net143	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	net87	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	CIb	mid1	net143	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	Bb	mid2	net143	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	CIbb	mid1	net87	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	CIb	mid2	net87	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	CIbb	CIb	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	CIb	CI	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab2	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Abb2	Ab2	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	Ab1	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	Abb2	Bb	mid1	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	Ab1	B	mid1	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	Abb2	B	mid2	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	Ab1	Bb	mid2	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	net143	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	net87	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	CIb	mid2	net143	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	Bb	mid1	net143	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	CIbb	mid2	net87	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	CIb	mid1	net87	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	CIbb	CIb	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	CIb	CI	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Ab2	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Abb2	Ab2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	Ab1	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	Abb2	B	mid1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	Ab1	Bb	mid1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Abb2	Bb	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Ab1	B	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	net143	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	net87	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	CIb	mid1	net143	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	Bb	mid2	net143	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	CIbb	mid1	net87	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	CIb	mid2	net87	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	CIbb	CIb	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	CIb	CI	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab2	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Abb2	Ab2	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	Ab1	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	Abb2	Bb	mid1	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	Ab1	B	mid1	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	Abb2	B	mid2	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	Ab1	Bb	mid2	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/fah/sky130_fd_sc_ms__fah_4.spice b/cells/fah/sky130_fd_sc_ms__fah_4.spice
index ca09c3f..e2fd8b6 100644
--- a/cells/fah/sky130_fd_sc_ms__fah_4.spice
+++ b/cells/fah/sky130_fd_sc_ms__fah_4.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_ms__fah_4 A B CI VGND VNB VPB VPWR COUT SUM
-M1000 a_1268_379# a_531_362# a_586_257# VPB pshort w=840000u l=180000u
-+  ad=3.486e+11p pd=2.51e+06u as=3.7495e+11p ps=2.95e+06u
-M1001 a_1183_102# a_536_114# a_1278_102# VPB pshort w=840000u l=180000u
-+  ad=3.63125e+11p pd=2.94e+06u as=6.468e+11p ps=3.22e+06u
-M1002 VGND a_1278_102# SUM VNB nlowvt w=740000u l=150000u
-+  ad=3.15805e+12p pd=2.382e+07u as=4.144e+11p ps=4.08e+06u
-M1003 a_430_362# a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=5.782e+11p pd=5.13e+06u as=4.54925e+12p ps=2.931e+07u
-M1004 a_1378_125# a_536_114# a_1268_379# VPB pshort w=840000u l=180000u
-+  ad=7.049e+11p pd=5.6e+06u as=0p ps=0u
-M1005 VPWR A a_27_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1006 a_200_74# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=7.337e+11p pd=5.7e+06u as=0p ps=0u
-M1007 a_430_362# a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.026e+11p pd=3.94e+06u as=0p ps=0u
-M1008 COUT a_1268_379# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1009 COUT a_1268_379# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1010 a_586_257# B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_1268_379# COUT VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 SUM a_1278_102# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.16e+11p pd=5.58e+06u as=0p ps=0u
-M1013 VPWR a_1278_102# SUM VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_1268_379# COUT VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_1278_102# SUM VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_1378_125# a_1183_102# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND CI a_1378_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.616e+11p ps=3.69e+06u
-M1018 a_536_114# B a_430_362# VNB nlowvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1019 a_200_74# a_586_257# a_531_362# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.31e+11p ps=2.23e+06u
-M1020 VGND a_1378_125# a_1183_102# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=4.4305e+11p ps=3.95e+06u
-M1021 a_1278_102# a_531_362# a_1183_102# VNB nlowvt w=640000u l=150000u
-+  ad=2.44125e+11p pd=2.21e+06u as=0p ps=0u
-M1022 COUT a_1268_379# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_536_114# B a_200_74# VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1024 VPWR a_1268_379# COUT VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_586_257# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=5.59925e+11p pd=5.19e+06u as=0p ps=0u
-M1026 a_586_257# a_536_114# a_1268_379# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.3685e+11p ps=2.18e+06u
-M1027 a_531_362# B a_200_74# VNB nlowvt w=640000u l=150000u
-+  ad=2.048e+11p pd=1.92e+06u as=4.268e+11p ps=4.01e+06u
-M1028 SUM a_1278_102# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_430_362# a_586_257# a_536_114# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_200_74# a_586_257# a_536_114# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_1278_102# SUM VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 SUM a_1278_102# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_531_362# B a_430_362# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR CI a_1378_125# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_430_362# a_586_257# a_531_362# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 COUT a_1268_379# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND A a_27_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1038 a_200_74# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_1268_379# COUT VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1378_125# a_536_114# a_1278_102# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_1268_379# a_531_362# a_1378_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 SUM a_1278_102# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_1278_102# a_531_362# a_1378_125# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_1278_102# SUM VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_200_74# B a_536_114# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 VPWR B a_586_257# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_1378_125# CI VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_430_362# B a_536_114# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 SUM a_1278_102# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 SUM a_1278_102# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_531_362# a_586_257# a_200_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X8 VGND A a_200_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 VPWR a_1268_379# COUT VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 VPWR a_1278_102# SUM VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 COUT a_1268_379# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VGND a_1268_379# COUT VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VGND a_1268_379# COUT VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_1378_125# CI VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 a_200_74# B a_531_362# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X16 a_1183_102# a_531_362# a_1278_102# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 a_1278_102# a_536_114# a_1378_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X18 a_1183_102# a_1378_125# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X19 a_1278_102# a_536_114# a_1183_102# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X20 VGND a_27_74# a_430_362# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 VGND B a_586_257# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 COUT a_1268_379# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 VPWR A a_200_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X24 a_1268_379# a_536_114# a_1378_125# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X25 a_1183_102# a_1378_125# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X26 VPWR a_1268_379# COUT VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 a_1378_125# a_531_362# a_1268_379# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X28 a_536_114# a_586_257# a_430_362# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X29 a_1378_125# a_531_362# a_1278_102# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X30 a_1268_379# a_536_114# a_586_257# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X31 VGND a_1278_102# SUM VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X32 a_586_257# a_531_362# a_1268_379# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X33 COUT a_1268_379# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X34 SUM a_1278_102# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X35 VPWR a_27_74# a_430_362# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X36 COUT a_1268_379# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X37 a_27_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X38 a_430_362# B a_531_362# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X39 a_536_114# a_586_257# a_200_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X40 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X41 VGND a_1278_102# SUM VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X42 a_531_362# a_586_257# a_430_362# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X43 SUM a_1278_102# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/fahcin/sky130_fd_sc_ms__fahcin_1.cdl b/cells/fahcin/sky130_fd_sc_ms__fahcin_1.cdl
index b867ce9..5471850 100644
--- a/cells/fahcin/sky130_fd_sc_ms__fahcin_1.cdl
+++ b/cells/fahcin/sky130_fd_sc_ms__fahcin_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ms__fahcin_1 A B CIN VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I CIN:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMIP3 SUM net184 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 Bbb Bb VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 Ab Bb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 Abb B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 Abb Bb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 Ab B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 CINb1 CIN VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 CINbb2 CINb2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 CINb2 CIN VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 CINbb2 mid2 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MMIP3 SUM net184 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI32 Bbb Bb VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 CINb2 mid1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI27 Ab Bb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI3 Bbb mid2 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI26 Abb B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 CINb1 mid1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI22 Abb Bb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 SUM net184 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI23 Ab B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 CINb1 mid2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI19 CINb1 CIN VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Ab B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Abb Bb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 Ab Bb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 Abb B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 CINb1 CIN VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 CINbb2 CINb2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 CINb2 CIN VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 CINbb2 mid1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI13 CINbb2 CINb2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 CINb2 mid2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI47 Abb Ab VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 Bbb mid1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI12 CINb2 CIN VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 Bb B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Bbb Bb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI650 CINbb2 mid2 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 Ab A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI1 CINb2 mid1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI3 Bbb mid2 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 CINb1 mid1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 SUM net184 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 CINb1 mid2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 Ab B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 Abb Bb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI21 Ab Bb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 Abb B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 CINb1 CIN VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 CINbb2 CINb2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 CINb2 CIN VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 Ab A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 Abb Ab VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 Bb B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 CINbb2 mid1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 CINb2 mid2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 Bbb mid1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 Bbb Bb VNB nfet_01v8_lvt m=1 w=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_ms__fahcin_1
diff --git a/cells/fahcin/sky130_fd_sc_ms__fahcin_1.netlist.tsv b/cells/fahcin/sky130_fd_sc_ms__fahcin_1.netlist.tsv
index 1318a2c..45bb54a 100644
--- a/cells/fahcin/sky130_fd_sc_ms__fahcin_1.netlist.tsv
+++ b/cells/fahcin/sky130_fd_sc_ms__fahcin_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ms__fahcin_1	A:I B:I CIN:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP3	MOSFET	SUM	net184	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	Bbb	Bb	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	Ab	Bb	mid2	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	Abb	B	mid2	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	Abb	Bb	mid1	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	Ab	B	mid1	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	CINb1	CIN	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	CINbb2	CINb2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	CINb2	CIN	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	CINbb2	mid2	net184	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	CINb2	mid1	net184	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	Bbb	mid2	COUT	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	CINb1	mid1	COUT	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	net184	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	CINb1	mid2	COUT	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Ab	B	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Abb	Bb	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	Ab	Bb	mid1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	Abb	B	mid1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	CINb1	CIN	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	CINbb2	CINb2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	CINb2	CIN	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	CINbb2	mid1	net184	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	CINb2	mid2	net184	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	Bbb	mid1	COUT	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Bbb	Bb	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	net184	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	Bbb	Bb	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	Ab	Bb	mid2	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	Abb	B	mid2	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	Abb	Bb	mid1	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	Ab	B	mid1	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	CINb1	CIN	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	CINbb2	CINb2	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	CINb2	CIN	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	CINbb2	mid2	net184	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	CINb2	mid1	net184	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	Bbb	mid2	COUT	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	CINb1	mid1	COUT	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	net184	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	CINb1	mid2	COUT	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Ab	B	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Abb	Bb	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	Ab	Bb	mid1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	Abb	B	mid1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	CINb1	CIN	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	CINbb2	CINb2	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	CINb2	CIN	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	CINbb2	mid1	net184	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	CINb2	mid2	net184	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	Bbb	mid1	COUT	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	Bbb	Bb	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/fahcin/sky130_fd_sc_ms__fahcin_1.spice b/cells/fahcin/sky130_fd_sc_ms__fahcin_1.spice
index 3b0f8f5..c5b37b9 100644
--- a/cells/fahcin/sky130_fd_sc_ms__fahcin_1.spice
+++ b/cells/fahcin/sky130_fd_sc_ms__fahcin_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ms__fahcin_1 A B CIN VGND VNB VPB VPWR COUT SUM
-M1000 VGND a_1857_368# a_1967_384# VNB nlowvt w=640000u l=150000u
-+  ad=1.989e+12p pd=1.212e+07u as=2.808e+11p ps=2.29e+06u
-M1001 COUT a_430_418# a_1200_368# VNB nlowvt w=640000u l=150000u
-+  ad=9.056e+11p pd=4.11e+06u as=1.792e+11p ps=1.84e+06u
-M1002 a_1857_368# CIN VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.33e+11p pd=2.13e+06u as=0p ps=0u
-M1003 a_1857_368# CIN VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=7.3255e+11p pd=5.84e+06u as=2.058e+12p ps=1.28e+07u
-M1004 a_608_74# B a_28_74# VNB nlowvt w=640000u l=150000u
-+  ad=3.40325e+11p pd=2.79e+06u as=3.901e+11p ps=3.89e+06u
-M1005 a_1200_368# a_492_48# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=3.85e+11p pd=2.81e+06u as=0p ps=0u
-M1006 a_259_368# a_492_48# a_430_418# VPB pshort w=840000u l=180000u
-+  ad=5.404e+11p pd=4.86e+06u as=5.082e+11p ps=4.57e+06u
-M1007 a_28_74# a_492_48# a_608_74# VPB pshort w=840000u l=180000u
-+  ad=7.63e+11p pd=5.55e+06u as=3.32325e+11p ps=2.78e+06u
-M1008 a_430_418# B a_28_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_259_368# a_28_74# VGND VNB nlowvt w=640000u l=150000u
-+  ad=5.088e+11p pd=4.15e+06u as=0p ps=0u
-M1010 a_1967_384# a_430_418# a_2004_136# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=5.088e+11p ps=2.87e+06u
-M1011 SUM a_2004_136# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1012 a_2004_136# a_608_74# a_1967_384# VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=5.152e+11p ps=4.8e+06u
-M1013 a_1598_400# a_430_418# COUT VPB pshort w=840000u l=180000u
-+  ad=3.98e+11p pd=2.82e+06u as=1.029e+12p ps=4.13e+06u
-M1014 a_28_74# a_492_48# a_430_418# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.648e+11p ps=3.7e+06u
-M1015 a_1857_368# a_430_418# a_2004_136# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND B a_492_48# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.22e+11p ps=2.08e+06u
-M1017 VGND A a_28_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_2004_136# a_608_74# a_1857_368# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 COUT a_608_74# a_1200_368# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND CIN a_1598_400# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.24e+11p ps=1.98e+06u
-M1021 SUM a_2004_136# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1022 a_608_74# B a_259_368# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1598_400# a_608_74# COUT VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_259_368# a_28_74# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_259_368# a_492_48# a_608_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1200_368# a_492_48# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A a_28_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR CIN a_1598_400# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_1857_368# a_1967_384# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_430_418# B a_259_368# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR B a_492_48# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
+X0 VPWR a_492_48# a_1200_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VPWR a_28_74# a_259_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_608_74# a_492_48# a_28_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 a_1598_400# CIN VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_2004_136# a_430_418# a_1857_368# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X6 a_1200_368# a_430_418# COUT VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X7 a_28_74# B a_608_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_1857_368# a_608_74# a_2004_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 VPWR CIN a_1857_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_608_74# a_492_48# a_259_368# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 VPWR a_2004_136# SUM VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_430_418# a_492_48# a_259_368# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X13 VGND a_28_74# a_259_368# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 a_430_418# a_492_48# a_28_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 a_28_74# B a_430_418# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X16 a_1967_384# a_1857_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 a_1200_368# a_608_74# COUT VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X18 VGND a_2004_136# SUM VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 COUT a_430_418# a_1598_400# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X20 VGND a_492_48# a_1200_368# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X21 a_1598_400# CIN VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X22 a_492_48# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_1967_384# a_608_74# a_2004_136# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X24 a_1967_384# a_1857_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X25 a_2004_136# a_430_418# a_1967_384# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X26 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 a_492_48# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 COUT a_608_74# a_1598_400# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X29 a_259_368# B a_608_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X30 a_259_368# B a_430_418# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X31 VGND CIN a_1857_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/fahcon/sky130_fd_sc_ms__fahcon_1.cdl b/cells/fahcon/sky130_fd_sc_ms__fahcon_1.cdl
index a431e66..54abd64 100644
--- a/cells/fahcon/sky130_fd_sc_ms__fahcon_1.cdl
+++ b/cells/fahcon/sky130_fd_sc_ms__fahcon_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ms__fahcon_1 A B CI VGND VNB VPB VPWR COUT_N SUM
 *.PININFO A:I B:I CI:I VGND:I VNB:I VPB:I VPWR:I COUT_N:O SUM:O
-MMIP3 SUM net186 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 SUM net186 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 Bb2 B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 Bb2 B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI27 Ab Bb1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 Ab Bb1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI26 Abb B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 Abb B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI22 Abb Bb1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 Abb Bb1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI23 Ab B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 Ab B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI19 CIb1 CI VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 CIb1 CI VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI13 CIbb2 CIb2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 Abb Ab VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 CIbb2 CIb2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI12 CIb2 CI VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI16 Bb1 B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 CIb2 CI VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 CIb2 mid2 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 Ab A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb1 B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI1 CIbb2 mid1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI3 Bb2 mid2 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 CIb2 mid2 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI4 CIb1 mid1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN3 SUM net186 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 CIb1 mid2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 Ab B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 CIbb2 mid1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI24 Abb Bb1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI21 Ab Bb1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 Abb B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 CIb1 CI VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 CIbb2 CIb2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 CIb2 CI VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 Ab A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI3 Bb2 mid2 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 CIb1 mid1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 SUM net186 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 CIb1 mid2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Ab B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Abb Bb1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 Ab Bb1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 Abb B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 CIb1 CI VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 CIbb2 CIb2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 CIb2 CI VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb1 B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 CIb2 mid1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 CIbb2 mid2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 Bb2 mid1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Bb2 B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 Abb Ab VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 Bb1 B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 CIb2 mid1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 CIbb2 mid2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 Bb2 mid1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 Bb2 B VNB nfet_01v8_lvt m=1 w=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_ms__fahcon_1
diff --git a/cells/fahcon/sky130_fd_sc_ms__fahcon_1.netlist.tsv b/cells/fahcon/sky130_fd_sc_ms__fahcon_1.netlist.tsv
index c54f8f0..d9ca828 100644
--- a/cells/fahcon/sky130_fd_sc_ms__fahcon_1.netlist.tsv
+++ b/cells/fahcon/sky130_fd_sc_ms__fahcon_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ms__fahcon_1	A:I B:I CI:I VGND:I VNB:I VPB:I VPWR:I COUT_N:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP3	MOSFET	SUM	net186	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	Bb2	B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	Ab	Bb1	mid2	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	Abb	B	mid2	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	Abb	Bb1	mid1	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	Ab	B	mid1	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	CIb1	CI	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	CIbb2	CIb2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	CIb2	CI	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb1	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	CIb2	mid2	net186	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	CIbb2	mid1	net186	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	Bb2	mid2	COUT_N	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	CIb1	mid1	COUT_N	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	net186	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	CIb1	mid2	COUT_N	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Ab	B	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Abb	Bb1	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	Ab	Bb1	mid1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	Abb	B	mid1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	CIb1	CI	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	CIbb2	CIb2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	CIb2	CI	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb1	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	CIb2	mid1	net186	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	CIbb2	mid2	net186	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	Bb2	mid1	COUT_N	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Bb2	B	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	net186	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	Bb2	B	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	Ab	Bb1	mid2	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	Abb	B	mid2	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	Abb	Bb1	mid1	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	Ab	B	mid1	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	CIb1	CI	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	CIbb2	CIb2	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	CIb2	CI	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb1	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	CIb2	mid2	net186	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	CIbb2	mid1	net186	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	Bb2	mid2	COUT_N	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	CIb1	mid1	COUT_N	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	net186	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	CIb1	mid2	COUT_N	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Ab	B	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Abb	Bb1	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	Ab	Bb1	mid1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	Abb	B	mid1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	CIb1	CI	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	CIbb2	CIb2	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	CIb2	CI	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb1	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	CIb2	mid1	net186	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	CIbb2	mid2	net186	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	Bb2	mid1	COUT_N	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	Bb2	B	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/fahcon/sky130_fd_sc_ms__fahcon_1.spice b/cells/fahcon/sky130_fd_sc_ms__fahcon_1.spice
index 34efb84..4461663 100644
--- a/cells/fahcon/sky130_fd_sc_ms__fahcon_1.spice
+++ b/cells/fahcon/sky130_fd_sc_ms__fahcon_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ms__fahcon_1 A B CI VGND VNB VPB VPWR COUT_N SUM
-M1000 a_372_365# a_336_263# a_244_368# VPB pshort w=840000u l=180000u
-+  ad=3.276e+11p pd=2.46e+06u as=6.6325e+11p ps=5.18e+06u
-M1001 a_1026_389# B VPWR VPB pshort w=1e+06u l=180000u
-+  ad=3.43e+11p pd=2.71e+06u as=1.6192e+12p ps=1.192e+07u
-M1002 a_244_368# a_27_100# VGND VNB nlowvt w=640000u l=150000u
-+  ad=3.616e+11p pd=3.69e+06u as=1.579e+12p ps=1.063e+07u
-M1003 a_374_120# a_336_263# a_244_368# VNB nlowvt w=640000u l=150000u
-+  ad=3.0045e+11p pd=2.29e+06u as=0p ps=0u
-M1004 a_1609_368# CI VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.589e+11p pd=2.2e+06u as=0p ps=0u
-M1005 VPWR CI a_1264_421# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=9.136e+11p ps=4.08e+06u
-M1006 a_1609_368# CI VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=5.488e+11p pd=5.04e+06u as=0p ps=0u
-M1007 a_1744_94# a_372_365# a_1719_368# VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=6.707e+11p ps=5.55e+06u
-M1008 a_27_100# B a_372_365# VPB pshort w=840000u l=180000u
-+  ad=5.404e+11p pd=5.02e+06u as=0p ps=0u
-M1009 SUM a_1744_94# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1010 a_1609_368# a_374_120# a_1744_94# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_374_120# a_336_263# a_27_100# VPB pshort w=840000u l=180000u
-+  ad=3.976e+11p pd=2.8e+06u as=0p ps=0u
-M1012 COUT_N a_374_120# a_1026_389# VPB pshort w=840000u l=180000u
-+  ad=3.99e+11p pd=2.63e+06u as=0p ps=0u
-M1013 a_27_100# B a_374_120# VNB nlowvt w=640000u l=150000u
-+  ad=3.965e+11p pd=3.91e+06u as=0p ps=0u
-M1014 VGND A a_27_100# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_244_368# B a_372_365# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.912e+11p ps=2.19e+06u
-M1016 COUT_N a_372_365# a_1026_389# VNB nlowvt w=640000u l=150000u
-+  ad=3.584e+11p pd=2.4e+06u as=4.992e+11p ps=2.84e+06u
-M1017 VGND a_1609_368# a_1719_368# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.264e+11p ps=2.3e+06u
-M1018 a_1264_421# a_374_120# COUT_N VNB nlowvt w=640000u l=150000u
-+  ad=3.52e+11p pd=2.38e+06u as=0p ps=0u
-M1019 a_244_368# B a_374_120# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A a_27_100# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_244_368# a_27_100# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1719_368# a_374_120# a_1744_94# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=4.224e+11p ps=2.6e+06u
-M1023 a_1264_421# a_372_365# COUT_N VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND B a_336_263# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.662e+11p ps=2.74e+06u
-M1025 VGND CI a_1264_421# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1744_94# a_372_365# a_1609_368# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR B a_336_263# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1028 VPWR a_1609_368# a_1719_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 SUM a_1744_94# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1030 a_372_365# a_336_263# a_27_100# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1026_389# B VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1264_421# CI VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VPWR a_1744_94# SUM VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_372_365# B a_244_368# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_244_368# a_336_263# a_374_120# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_27_100# a_336_263# a_374_120# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 COUT_N a_372_365# a_1264_421# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X6 VGND B a_1026_389# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X7 a_1264_421# CI VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_1744_94# a_374_120# a_1609_368# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 a_27_100# a_336_263# a_372_365# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_27_100# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_374_120# B a_244_368# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X12 a_1744_94# a_374_120# a_1719_368# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 a_1719_368# a_1609_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 a_336_263# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_336_263# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_1609_368# a_372_365# a_1744_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 a_372_365# B a_27_100# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X18 a_1026_389# a_374_120# COUT_N VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X19 a_27_100# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_1719_368# a_372_365# a_1744_94# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X21 VGND CI a_1609_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 VGND a_1744_94# SUM VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 VPWR CI a_1609_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 VPWR a_27_100# a_244_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X25 VPWR B a_1026_389# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X26 a_1719_368# a_1609_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X27 VGND a_27_100# a_244_368# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X28 a_1026_389# a_372_365# COUT_N VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X29 a_374_120# B a_27_100# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X30 COUT_N a_374_120# a_1264_421# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X31 a_244_368# a_336_263# a_372_365# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
 .ends
diff --git a/cells/ha/sky130_fd_sc_ms__ha_1.cdl b/cells/ha/sky130_fd_sc_ms__ha_1.cdl
index 3126794..d417792 100644
--- a/cells/ha/sky130_fd_sc_ms__ha_1.cdl
+++ b/cells/ha/sky130_fd_sc_ms__ha_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ms__ha_1 A B VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMIN2 COUT majb VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 COUT majb VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 SUM sumb VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand0 VGND A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand1 sndNA B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs1 sumb majb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs20 VGND A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs21 VGND B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 COUT majb VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 SUM sumb VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 majb A VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 majb B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs1 VPWR majb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs20 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 SUM sumb VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand0 VGND A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs1 sumb majb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs20 VGND A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs21 VGND B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 COUT majb VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 SUM sumb VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 majb A VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 majb B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs1 VPWR majb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs20 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs21 sndPA B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPs21 sndPA B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__ha_1
diff --git a/cells/ha/sky130_fd_sc_ms__ha_1.netlist.tsv b/cells/ha/sky130_fd_sc_ms__ha_1.netlist.tsv
index dff12a9..4f9b6ea 100644
--- a/cells/ha/sky130_fd_sc_ms__ha_1.netlist.tsv
+++ b/cells/ha/sky130_fd_sc_ms__ha_1.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ms__ha_1	A:I B:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN2	MOSFET	COUT	majb	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A	sndNA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	majb	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs1	MOSFET	sumb	majb	nint1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs20	MOSFET	VGND	A	nint1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs21	MOSFET	VGND	B	nint1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	majb	A	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	majb	B	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1	MOSFET	VPWR	majb	sumb	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs20	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs21	MOSFET	sndPA	B	sumb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	majb	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1	MOSFET	sumb	majb	nint1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs20	MOSFET	VGND	A	nint1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs21	MOSFET	VGND	B	nint1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	majb	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	majb	A	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	majb	B	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1	MOSFET	VPWR	majb	sumb	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs20	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs21	MOSFET	sndPA	B	sumb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ha/sky130_fd_sc_ms__ha_1.spice b/cells/ha/sky130_fd_sc_ms__ha_1.spice
index bf1c3e9..1ef353e 100644
--- a/cells/ha/sky130_fd_sc_ms__ha_1.spice
+++ b/cells/ha/sky130_fd_sc_ms__ha_1.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__ha_1 A B VGND VNB VPB VPWR COUT SUM
-M1000 VPWR A a_239_294# VPB pshort w=840000u l=180000u
-+  ad=1.6456e+12p pd=9.84e+06u as=2.268e+11p ps=2.22e+06u
-M1001 a_695_119# B a_239_294# VNB nlowvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=1.824e+11p ps=1.85e+06u
-M1002 VPWR A a_389_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.9e+11p ps=2.78e+06u
-M1003 a_389_392# B a_83_260# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.13e+11p ps=2.65e+06u
-M1004 COUT a_239_294# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=6.95225e+11p ps=6.36e+06u
-M1005 VPWR a_83_260# SUM VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1006 a_83_260# a_239_294# VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_305_130# a_239_294# a_83_260# VNB nlowvt w=640000u l=150000u
-+  ad=3.616e+11p pd=3.69e+06u as=1.726e+11p ps=1.85e+06u
-M1008 COUT a_239_294# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1009 VGND B a_305_130# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A a_695_119# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_83_260# SUM VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1012 a_239_294# B VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_305_130# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A a_305_130# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 a_239_294# B a_695_119# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_695_119# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_239_294# A VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X4 VPWR a_239_294# COUT VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_305_130# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 SUM a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VPWR a_239_294# a_83_260# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X8 VPWR B a_239_294# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 a_83_260# B a_389_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_389_392# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_83_260# a_239_294# a_305_130# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 SUM a_83_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VGND a_239_294# COUT VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/ha/sky130_fd_sc_ms__ha_2.cdl b/cells/ha/sky130_fd_sc_ms__ha_2.cdl
index ab14215..7cdb731 100644
--- a/cells/ha/sky130_fd_sc_ms__ha_2.cdl
+++ b/cells/ha/sky130_fd_sc_ms__ha_2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ms__ha_2 A B VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMIN2 COUT majb VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 COUT majb VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 SUM sumb VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand0 VGND A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand1 sndNA B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs1 sumb majb VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs20 VGND A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs21 VGND B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 COUT majb VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 SUM sumb VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 majb A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 majb B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs1 VPWR majb VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs20 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 SUM sumb VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand0 VGND A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs1 sumb majb VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs20 VGND A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs21 VGND B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 COUT majb VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 SUM sumb VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 majb A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 majb B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs1 VPWR majb VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs20 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs21 sndPA B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPs21 sndPA B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__ha_2
diff --git a/cells/ha/sky130_fd_sc_ms__ha_2.netlist.tsv b/cells/ha/sky130_fd_sc_ms__ha_2.netlist.tsv
index 5ae5016..bbc135f 100644
--- a/cells/ha/sky130_fd_sc_ms__ha_2.netlist.tsv
+++ b/cells/ha/sky130_fd_sc_ms__ha_2.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ms__ha_2	A:I B:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN2	MOSFET	COUT	majb	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A	sndNA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	majb	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs1	MOSFET	sumb	majb	nint1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs20	MOSFET	VGND	A	nint1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs21	MOSFET	VGND	B	nint1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	majb	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	majb	B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1	MOSFET	VPWR	majb	sumb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs20	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs21	MOSFET	sndPA	B	sumb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	majb	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1	MOSFET	sumb	majb	nint1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs20	MOSFET	VGND	A	nint1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs21	MOSFET	VGND	B	nint1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	majb	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	majb	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	majb	B	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1	MOSFET	VPWR	majb	sumb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs20	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs21	MOSFET	sndPA	B	sumb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ha/sky130_fd_sc_ms__ha_2.spice b/cells/ha/sky130_fd_sc_ms__ha_2.spice
index 0e4d282..c195edf 100644
--- a/cells/ha/sky130_fd_sc_ms__ha_2.spice
+++ b/cells/ha/sky130_fd_sc_ms__ha_2.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ms__ha_2 A B VGND VNB VPB VPWR COUT SUM
-M1000 COUT a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=1.01665e+12p ps=1.023e+07u
-M1001 a_278_74# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.083e+11p pd=4.09e+06u as=0p ps=0u
-M1002 SUM a_394_388# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=1.9664e+12p ps=1.448e+07u
-M1003 VPWR a_394_388# SUM VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 SUM a_394_388# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.442e+11p pd=2.14e+06u as=0p ps=0u
-M1005 a_310_388# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1006 COUT a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1007 VGND B a_278_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_27_74# COUT VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A a_114_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1010 a_394_388# B a_310_388# VPB pshort w=1e+06u l=180000u
-+  ad=9.6e+11p pd=3.92e+06u as=0p ps=0u
-M1011 VPWR a_27_74# COUT VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_394_388# SUM VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_27_74# a_394_388# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_74# B VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1015 VPWR A a_27_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_114_74# B a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1017 a_278_74# a_27_74# a_394_388# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.01625e+11p ps=2.05e+06u
+X0 a_278_74# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_394_388# a_27_74# a_278_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VGND a_27_74# COUT VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR B a_27_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 SUM a_394_388# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 COUT a_27_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_394_388# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VPWR A a_310_388# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_27_74# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 VPWR a_394_388# SUM VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_310_388# B a_394_388# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 SUM a_394_388# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VGND A a_278_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VPWR a_27_74# COUT VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VGND a_394_388# SUM VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_27_74# B a_114_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_114_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 COUT a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/ha/sky130_fd_sc_ms__ha_4.cdl b/cells/ha/sky130_fd_sc_ms__ha_4.cdl
index 3aedaa6..b9e071d 100644
--- a/cells/ha/sky130_fd_sc_ms__ha_4.cdl
+++ b/cells/ha/sky130_fd_sc_ms__ha_4.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ms__ha_4 A B VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMIN2 COUT majb VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 COUT majb VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 SUM sumb VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand0 VGND A VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand1 sndNA B VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs1 sumb majb VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs20 VGND A VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs21 VGND B VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 COUT majb VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 SUM sumb VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 majb A VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 majb B VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs1 VPWR majb VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs20 VPWR A VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 SUM sumb VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand0 VGND A VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA B VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs1 sumb majb VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs20 VGND A VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs21 VGND B VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 COUT majb VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 SUM sumb VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 majb A VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 majb B VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs1 VPWR majb VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs20 VPWR A VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs21 sndPA B VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPs21 sndPA B VPB pfet_01v8 m=2 w=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_ms__ha_4
diff --git a/cells/ha/sky130_fd_sc_ms__ha_4.netlist.tsv b/cells/ha/sky130_fd_sc_ms__ha_4.netlist.tsv
index 4549c91..185df84 100644
--- a/cells/ha/sky130_fd_sc_ms__ha_4.netlist.tsv
+++ b/cells/ha/sky130_fd_sc_ms__ha_4.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ms__ha_4	A:I B:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN2	MOSFET	COUT	majb	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A	sndNA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	majb	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs1	MOSFET	sumb	majb	nint1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs20	MOSFET	VGND	A	nint1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs21	MOSFET	VGND	B	nint1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	majb	A	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	majb	B	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1	MOSFET	VPWR	majb	sumb	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs20	MOSFET	VPWR	A	sndPA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs21	MOSFET	sndPA	B	sumb	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	majb	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1	MOSFET	sumb	majb	nint1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs20	MOSFET	VGND	A	nint1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs21	MOSFET	VGND	B	nint1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	majb	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	majb	A	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	majb	B	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1	MOSFET	VPWR	majb	sumb	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs20	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs21	MOSFET	sndPA	B	sumb	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ha/sky130_fd_sc_ms__ha_4.spice b/cells/ha/sky130_fd_sc_ms__ha_4.spice
index 92bf6ad..a4ca8b4 100644
--- a/cells/ha/sky130_fd_sc_ms__ha_4.spice
+++ b/cells/ha/sky130_fd_sc_ms__ha_4.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_ms__ha_4 A B VGND VNB VPB VPWR COUT SUM
-M1000 a_435_99# B a_707_119# VNB nlowvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=5.856e+11p ps=5.67e+06u
-M1001 a_297_392# a_435_99# VPWR VPB pshort w=840000u l=180000u
-+  ad=4.968e+11p pd=4.76e+06u as=2.6878e+12p ps=2.354e+07u
-M1002 VGND B a_27_125# VNB nlowvt w=640000u l=150000u
-+  ad=1.6734e+12p pd=1.601e+07u as=7.744e+11p ps=7.54e+06u
-M1003 a_707_119# B a_435_99# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A a_707_119# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_297_392# SUM VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=5.069e+11p ps=4.33e+06u
-M1006 VPWR a_435_99# a_297_392# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_125# B VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_435_99# B VPWR VPB pshort w=840000u l=180000u
-+  ad=7.46425e+11p pd=5.89e+06u as=0p ps=0u
-M1009 COUT a_435_99# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=7.84e+11p pd=5.88e+06u as=0p ps=0u
-M1010 VGND a_435_99# COUT VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1011 a_707_119# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_435_99# COUT VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_125# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_435_99# COUT VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 SUM a_297_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.1e+11p ps=7.62e+06u
-M1017 a_27_392# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 COUT a_435_99# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_297_392# B a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_435_99# COUT VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_392# B a_297_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A a_27_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_297_392# a_435_99# a_27_125# VNB nlowvt w=640000u l=150000u
-+  ad=2.048e+11p pd=1.92e+06u as=0p ps=0u
-M1024 SUM a_297_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=8.96e+11p pd=6.08e+06u as=0p ps=0u
-M1025 VPWR B a_435_99# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 SUM a_297_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_297_392# SUM VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_27_125# a_435_99# a_297_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_435_99# A VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND a_297_392# SUM VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 SUM a_297_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 COUT a_435_99# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 COUT a_435_99# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR A a_435_99# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR a_297_392# SUM VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 SUM a_297_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_297_392# a_435_99# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 VGND B a_27_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 COUT a_435_99# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR a_435_99# COUT VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_707_119# B a_435_99# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 a_27_392# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_297_392# a_435_99# a_27_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 VPWR a_297_392# SUM VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VGND a_435_99# COUT VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND a_297_392# SUM VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VGND a_297_392# SUM VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VPWR a_297_392# SUM VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_27_392# B a_297_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 VPWR A a_435_99# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X15 VGND a_435_99# COUT VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_435_99# B a_707_119# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 VPWR a_435_99# a_297_392# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X18 VPWR a_435_99# COUT VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 COUT a_435_99# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 SUM a_297_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 VPWR B a_435_99# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X22 a_27_125# a_435_99# a_297_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X23 VGND A a_707_119# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X24 a_27_125# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X25 a_435_99# A VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X26 a_707_119# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X27 COUT a_435_99# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 COUT a_435_99# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X29 a_27_125# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X30 VGND A a_27_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X31 SUM a_297_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 VPWR A a_27_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X33 a_435_99# B VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X34 SUM a_297_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X35 a_297_392# B a_27_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_ms__inv_1.cdl b/cells/inv/sky130_fd_sc_ms__inv_1.cdl
index 07acf4d..e4b60e0 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_1.cdl
+++ b/cells/inv/sky130_fd_sc_ms__inv_1.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ms__inv_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__inv_1
diff --git a/cells/inv/sky130_fd_sc_ms__inv_1.netlist.tsv b/cells/inv/sky130_fd_sc_ms__inv_1.netlist.tsv
index 899b47d..18715a7 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_1.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_ms__inv_1.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ms__inv_1	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_ms__inv_1.spice b/cells/inv/sky130_fd_sc_ms__inv_1.spice
index 28bb0dc..af35fda 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_1.spice
+++ b/cells/inv/sky130_fd_sc_ms__inv_1.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_ms__inv_1 A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=2.627e+11p ps=2.19e+06u
-M1001 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=3.696e+11p ps=2.9e+06u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_ms__inv_16.cdl b/cells/inv/sky130_fd_sc_ms__inv_16.cdl
index 3031894..1a60e0c 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_16.cdl
+++ b/cells/inv/sky130_fd_sc_ms__inv_16.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ms__inv_16 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB pshort m=16 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8 m=16 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nlowvt m=16 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Y A VNB nfet_01v8_lvt m=16 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__inv_16
diff --git a/cells/inv/sky130_fd_sc_ms__inv_16.netlist.tsv b/cells/inv/sky130_fd_sc_ms__inv_16.netlist.tsv
index 5e46b3d..91e6a4e 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_16.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_ms__inv_16.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ms__inv_16	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	VPWR	VPB	pshort	16	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nlowvt	16	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_01v8	16	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	16	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_ms__inv_16.spice b/cells/inv/sky130_fd_sc_ms__inv_16.spice
index eea8ecd..8a15d7b 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_16.spice
+++ b/cells/inv/sky130_fd_sc_ms__inv_16.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ms__inv_16 A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.6576e+12p pd=1.632e+07u as=2.2718e+12p ps=1.946e+07u
-M1001 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.4528e+12p pd=2.23e+07u as=3.1584e+12p ps=2.58e+07u
-M1005 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X29 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X30 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X31 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_ms__inv_2.cdl b/cells/inv/sky130_fd_sc_ms__inv_2.cdl
index 340f18d..169de85 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_2.cdl
+++ b/cells/inv/sky130_fd_sc_ms__inv_2.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ms__inv_2 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__inv_2
diff --git a/cells/inv/sky130_fd_sc_ms__inv_2.netlist.tsv b/cells/inv/sky130_fd_sc_ms__inv_2.netlist.tsv
index 19acdae..3383315 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_2.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_ms__inv_2.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ms__inv_2	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_ms__inv_2.spice b/cells/inv/sky130_fd_sc_ms__inv_2.spice
index 58fd948..d648fb9 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_2.spice
+++ b/cells/inv/sky130_fd_sc_ms__inv_2.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_ms__inv_2 A VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=6.048e+11p ps=5.56e+06u
-M1001 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=4.218e+11p ps=4.1e+06u
-M1003 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_ms__inv_4.cdl b/cells/inv/sky130_fd_sc_ms__inv_4.cdl
index 790747c..329568a 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_4.cdl
+++ b/cells/inv/sky130_fd_sc_ms__inv_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ms__inv_4 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y A VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__inv_4
diff --git a/cells/inv/sky130_fd_sc_ms__inv_4.netlist.tsv b/cells/inv/sky130_fd_sc_ms__inv_4.netlist.tsv
index e7c0578..beb1038 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_4.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_ms__inv_4.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ms__inv_4	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_ms__inv_4.spice b/cells/inv/sky130_fd_sc_ms__inv_4.spice
index fdae630..8c96556 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_4.spice
+++ b/cells/inv/sky130_fd_sc_ms__inv_4.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__inv_4 A VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=9.296e+11p ps=8.38e+06u
-M1001 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=6.882e+11p pd=6.3e+06u as=4.44e+11p ps=4.16e+06u
-M1003 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_ms__inv_8.cdl b/cells/inv/sky130_fd_sc_ms__inv_8.cdl
index 7d21a29..47c7eaa 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_8.cdl
+++ b/cells/inv/sky130_fd_sc_ms__inv_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ms__inv_8 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB pshort m=8 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8 m=8 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nlowvt m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y A VNB nfet_01v8_lvt m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__inv_8
diff --git a/cells/inv/sky130_fd_sc_ms__inv_8.netlist.tsv b/cells/inv/sky130_fd_sc_ms__inv_8.netlist.tsv
index 658c0bc..37a66ea 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_8.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_ms__inv_8.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ms__inv_8	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	VPWR	VPB	pshort	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nlowvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_01v8	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_ms__inv_8.spice b/cells/inv/sky130_fd_sc_ms__inv_8.spice
index 979f747..d8df255 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_8.spice
+++ b/cells/inv/sky130_fd_sc_ms__inv_8.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ms__inv_8 A VGND VNB VPB VPWR Y
-M1000 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=1.2025e+12p pd=1.065e+07u as=8.288e+11p ps=8.16e+06u
-M1001 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2096e+12p pd=1.112e+07u as=1.7024e+12p ps=1.424e+07u
-M1003 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/maj3/sky130_fd_sc_ms__maj3_1.cdl b/cells/maj3/sky130_fd_sc_ms__maj3_1.cdl
index abd7c03..c5e1665 100644
--- a/cells/maj3/sky130_fd_sc_ms__maj3_1.cdl
+++ b/cells/maj3/sky130_fd_sc_ms__maj3_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ms__maj3_1 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN10 y B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN10 y B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN11 sndNBa A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN11 sndNBa A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN20 y B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN20 y B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN21 sndNBc C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN30 y C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN21 sndNBc C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN31 sndNCa A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN30 y C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP10 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN31 sndNCa A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP11 sndPAb B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP20 VPWR C VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP10 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP21 sndPCb B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP11 sndPAb B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP30 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP20 VPWR C VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP21 sndPCb B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP30 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP31 sndPAc C VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP31 sndPAc C VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__maj3_1
diff --git a/cells/maj3/sky130_fd_sc_ms__maj3_1.netlist.tsv b/cells/maj3/sky130_fd_sc_ms__maj3_1.netlist.tsv
index 26c0999..732244a 100644
--- a/cells/maj3/sky130_fd_sc_ms__maj3_1.netlist.tsv
+++ b/cells/maj3/sky130_fd_sc_ms__maj3_1.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ms__maj3_1	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN2	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN10	MOSFET	y	B	sndNBa	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN11	MOSFET	sndNBa	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN20	MOSFET	y	B	sndNBc	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN21	MOSFET	sndNBc	C	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN30	MOSFET	y	C	sndNCa	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN31	MOSFET	sndNCa	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP10	MOSFET	VPWR	A	sndPAb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP11	MOSFET	sndPAb	B	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP20	MOSFET	VPWR	C	sndPCb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP21	MOSFET	sndPCb	B	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP30	MOSFET	VPWR	A	sndPAc	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP31	MOSFET	sndPAc	C	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN10	MOSFET	y	B	sndNBa	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN11	MOSFET	sndNBa	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN20	MOSFET	y	B	sndNBc	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN21	MOSFET	sndNBc	C	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN30	MOSFET	y	C	sndNCa	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN31	MOSFET	sndNCa	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP10	MOSFET	VPWR	A	sndPAb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP11	MOSFET	sndPAb	B	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP20	MOSFET	VPWR	C	sndPCb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP21	MOSFET	sndPCb	B	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP30	MOSFET	VPWR	A	sndPAc	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP31	MOSFET	sndPAc	C	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/maj3/sky130_fd_sc_ms__maj3_1.spice b/cells/maj3/sky130_fd_sc_ms__maj3_1.spice
index c1bf20d..0e10a6e 100644
--- a/cells/maj3/sky130_fd_sc_ms__maj3_1.spice
+++ b/cells/maj3/sky130_fd_sc_ms__maj3_1.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__maj3_1 A B C VGND VNB VPB VPWR X
-M1000 a_601_384# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=7.15e+11p ps=5.61e+06u
-M1001 VPWR a_84_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1002 VGND a_84_74# X VNB nlowvt w=740000u l=150000u
-+  ad=5.466e+11p pd=4.39e+06u as=2.081e+11p ps=2.05e+06u
-M1003 a_84_74# C a_601_384# VPB pshort w=1e+06u l=180000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1004 a_84_74# B a_223_120# VNB nlowvt w=640000u l=150000u
-+  ad=4.177e+11p pd=4.01e+06u as=1.536e+11p ps=1.76e+06u
-M1005 a_595_136# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1006 a_229_384# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1007 VGND C a_403_136# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1008 a_84_74# C a_595_136# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_409_384# B a_84_74# VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1010 a_84_74# B a_229_384# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_223_120# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR C a_409_384# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_403_136# B a_84_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_223_120# B a_84_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 VPWR A a_229_384# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_84_74# B a_409_384# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 a_229_384# B a_84_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_409_384# C VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 X a_84_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 X a_84_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND A a_223_120# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_403_136# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 VPWR A a_601_384# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_595_136# C a_84_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 a_601_384# C a_84_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 VGND A a_595_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 a_84_74# B a_403_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/maj3/sky130_fd_sc_ms__maj3_2.cdl b/cells/maj3/sky130_fd_sc_ms__maj3_2.cdl
index 7bec9d2..9e95fb1 100644
--- a/cells/maj3/sky130_fd_sc_ms__maj3_2.cdl
+++ b/cells/maj3/sky130_fd_sc_ms__maj3_2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ms__maj3_2 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN10 y B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN10 y B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN11 sndNBa A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN11 sndNBa A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN20 y B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN20 y B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN21 sndNBc C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN30 y C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN21 sndNBc C VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN31 sndNCa A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN30 y C VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP10 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN31 sndNCa A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP11 sndPAb B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP20 VPWR C VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP10 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP21 sndPCb B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP11 sndPAb B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP30 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP20 VPWR C VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP21 sndPCb B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP30 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP31 sndPAc C VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP31 sndPAc C VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__maj3_2
diff --git a/cells/maj3/sky130_fd_sc_ms__maj3_2.netlist.tsv b/cells/maj3/sky130_fd_sc_ms__maj3_2.netlist.tsv
index 5483aea..652fbfd 100644
--- a/cells/maj3/sky130_fd_sc_ms__maj3_2.netlist.tsv
+++ b/cells/maj3/sky130_fd_sc_ms__maj3_2.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ms__maj3_2	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN2	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN10	MOSFET	y	B	sndNBa	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN11	MOSFET	sndNBa	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN20	MOSFET	y	B	sndNBc	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN21	MOSFET	sndNBc	C	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN30	MOSFET	y	C	sndNCa	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN31	MOSFET	sndNCa	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP10	MOSFET	VPWR	A	sndPAb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP11	MOSFET	sndPAb	B	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP20	MOSFET	VPWR	C	sndPCb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP21	MOSFET	sndPCb	B	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP30	MOSFET	VPWR	A	sndPAc	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP31	MOSFET	sndPAc	C	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN10	MOSFET	y	B	sndNBa	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN11	MOSFET	sndNBa	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN20	MOSFET	y	B	sndNBc	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN21	MOSFET	sndNBc	C	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN30	MOSFET	y	C	sndNCa	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN31	MOSFET	sndNCa	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP10	MOSFET	VPWR	A	sndPAb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP11	MOSFET	sndPAb	B	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP20	MOSFET	VPWR	C	sndPCb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP21	MOSFET	sndPCb	B	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP30	MOSFET	VPWR	A	sndPAc	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP31	MOSFET	sndPAc	C	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/maj3/sky130_fd_sc_ms__maj3_2.spice b/cells/maj3/sky130_fd_sc_ms__maj3_2.spice
index 615a4b7..1d03073 100644
--- a/cells/maj3/sky130_fd_sc_ms__maj3_2.spice
+++ b/cells/maj3/sky130_fd_sc_ms__maj3_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ms__maj3_2 A B C VGND VNB VPB VPWR X
-M1000 a_396_368# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=3.43375e+11p pd=2.86e+06u as=1.495e+12p ps=9.5e+06u
-M1001 VPWR C a_587_347# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1002 a_577_74# B a_87_264# VNB nlowvt w=740000u l=150000u
-+  ad=2.442e+11p pd=2.14e+06u as=4.181e+11p ps=4.09e+06u
-M1003 VGND C a_577_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.2062e+12p pd=7.7e+06u as=0p ps=0u
-M1004 VPWR a_87_264# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.024e+11p ps=2.78e+06u
-M1005 X a_87_264# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_793_368# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1007 a_87_264# B a_396_368# VPB pshort w=1e+06u l=180000u
-+  ad=5.5e+11p pd=5.1e+06u as=0p ps=0u
-M1008 a_413_74# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1009 a_87_264# B a_413_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_587_347# B a_87_264# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_87_264# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1012 a_793_74# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1013 a_87_264# C a_793_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_87_264# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_87_264# C a_793_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_793_368# C a_87_264# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_87_264# B a_587_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_587_347# C VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 a_87_264# B a_577_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR A a_793_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_413_74# B a_87_264# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_793_74# C a_87_264# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 X a_87_264# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VGND a_87_264# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VGND A a_413_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND A a_793_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VPWR A a_396_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 a_396_368# B a_87_264# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 a_577_74# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 X a_87_264# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 VPWR a_87_264# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/maj3/sky130_fd_sc_ms__maj3_4.cdl b/cells/maj3/sky130_fd_sc_ms__maj3_4.cdl
index 920b3eb..c5857fc 100644
--- a/cells/maj3/sky130_fd_sc_ms__maj3_4.cdl
+++ b/cells/maj3/sky130_fd_sc_ms__maj3_4.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ms__maj3_4 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN10 y B VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN10 y B VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN11 sndNBa A VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN11 sndNBa A VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN20 y B VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN20 y B VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN21 sndNBc C VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN30 y C VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN21 sndNBc C VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN31 sndNCa A VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN30 y C VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP10 VPWR A VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN31 sndNCa A VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP11 sndPAb B VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP20 VPWR C VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP10 VPWR A VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP21 sndPCb B VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP11 sndPAb B VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP30 VPWR A VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP20 VPWR C VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP21 sndPCb B VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP30 VPWR A VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP31 sndPAc C VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP31 sndPAc C VPB pfet_01v8 m=2 w=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_ms__maj3_4
diff --git a/cells/maj3/sky130_fd_sc_ms__maj3_4.netlist.tsv b/cells/maj3/sky130_fd_sc_ms__maj3_4.netlist.tsv
index b7ee1aa..0761fd4 100644
--- a/cells/maj3/sky130_fd_sc_ms__maj3_4.netlist.tsv
+++ b/cells/maj3/sky130_fd_sc_ms__maj3_4.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ms__maj3_4	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN2	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN10	MOSFET	y	B	sndNBa	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN11	MOSFET	sndNBa	A	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN20	MOSFET	y	B	sndNBc	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN21	MOSFET	sndNBc	C	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN30	MOSFET	y	C	sndNCa	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN31	MOSFET	sndNCa	A	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP10	MOSFET	VPWR	A	sndPAb	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP11	MOSFET	sndPAb	B	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP20	MOSFET	VPWR	C	sndPCb	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP21	MOSFET	sndPCb	B	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP30	MOSFET	VPWR	A	sndPAc	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP31	MOSFET	sndPAc	C	y	VPB	pshort	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_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN10	MOSFET	y	B	sndNBa	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN11	MOSFET	sndNBa	A	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN20	MOSFET	y	B	sndNBc	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN21	MOSFET	sndNBc	C	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN30	MOSFET	y	C	sndNCa	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN31	MOSFET	sndNCa	A	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP10	MOSFET	VPWR	A	sndPAb	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP11	MOSFET	sndPAb	B	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP20	MOSFET	VPWR	C	sndPCb	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP21	MOSFET	sndPCb	B	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP30	MOSFET	VPWR	A	sndPAc	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP31	MOSFET	sndPAc	C	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/maj3/sky130_fd_sc_ms__maj3_4.spice b/cells/maj3/sky130_fd_sc_ms__maj3_4.spice
index e94f28f..d843170 100644
--- a/cells/maj3/sky130_fd_sc_ms__maj3_4.spice
+++ b/cells/maj3/sky130_fd_sc_ms__maj3_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ms__maj3_4 A B C VGND VNB VPB VPWR X
-M1000 a_222_392# B a_504_125# VNB nlowvt w=640000u l=150000u
-+  ad=5.376e+11p pd=5.52e+06u as=5.41775e+11p ps=4.6e+06u
-M1001 X a_222_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.44e+11p pd=4.16e+06u as=1.2479e+12p ps=1.196e+07u
-M1002 a_908_392# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=1.971e+12p ps=1.647e+07u
-M1003 a_222_392# C a_906_78# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=4.45475e+11p ps=4.25e+06u
-M1004 a_222_392# B a_122_392# VPB pshort w=1e+06u l=180000u
-+  ad=8.6e+11p pd=7.72e+06u as=5.9e+11p ps=5.18e+06u
-M1005 a_222_392# C a_908_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_906_78# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_122_392# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_122_392# B a_222_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A a_122_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND C a_504_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_906_78# C a_222_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A a_906_78# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_908_392# C a_222_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A a_908_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A a_114_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=5.7375e+11p ps=4.61e+06u
-M1016 X a_222_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1017 a_114_125# B a_222_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_504_125# C VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_222_392# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_222_392# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_114_125# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_222_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_222_392# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_222_392# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_222_392# B a_114_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_504_125# B a_222_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 X a_222_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_504_392# C VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.9e+11p pd=5.18e+06u as=0p ps=0u
-M1029 VPWR C a_504_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_504_392# B a_222_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_222_392# B a_504_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_222_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_504_392# B a_222_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VPWR a_222_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VGND A a_906_78# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_222_392# B a_122_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 VGND a_222_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR A a_908_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_222_392# B a_114_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_222_392# B a_504_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 VPWR A a_122_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_908_392# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_504_125# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 X a_222_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_114_125# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 a_504_392# C VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X15 X a_222_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 VPWR C a_504_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X17 X a_222_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 a_906_78# C a_222_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X19 a_222_392# C a_906_78# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X20 a_122_392# B a_222_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X21 VGND a_222_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 X a_222_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 VGND A a_114_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X24 a_122_392# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X25 a_908_392# C a_222_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X26 VGND C a_504_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X27 a_114_125# B a_222_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X28 a_222_392# C a_908_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X29 a_222_392# B a_504_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X30 a_504_125# B a_222_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X31 a_906_78# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_ms__mux2_1.cdl b/cells/mux2/sky130_fd_sc_ms__mux2_1.cdl
index 3b2fb7e..549e9d4 100644
--- a/cells/mux2/sky130_fd_sc_ms__mux2_1.cdl
+++ b/cells/mux2/sky130_fd_sc_ms__mux2_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__mux2_1 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 xb A0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA01 smdNA0 Sb VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA10 xb A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA11 sndNA1 S VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X xb VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA01 sndPS A0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA11 sndPSb A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X xb VPB pfet_01v8 m=1 w=1.12 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_ms__mux2_1
diff --git a/cells/mux2/sky130_fd_sc_ms__mux2_1.netlist.tsv b/cells/mux2/sky130_fd_sc_ms__mux2_1.netlist.tsv
index 23291cc..e72432e 100644
--- a/cells/mux2/sky130_fd_sc_ms__mux2_1.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_ms__mux2_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__mux2_1	A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNA00	MOSFET	xb	A0	smdNA0	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	xb	A1	sndNA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	xb	A0	smdNA0	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	xb	A1	sndNA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2/sky130_fd_sc_ms__mux2_1.spice b/cells/mux2/sky130_fd_sc_ms__mux2_1.spice
index 269d05b..aa2d44e 100644
--- a/cells/mux2/sky130_fd_sc_ms__mux2_1.spice
+++ b/cells/mux2/sky130_fd_sc_ms__mux2_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__mux2_1 A0 A1 S VGND VNB VPB VPWR X
-M1000 a_304_74# A0 a_226_368# VPB pshort w=1e+06u l=180000u
-+  ad=3.6e+11p pd=2.72e+06u as=7.85e+11p ps=3.57e+06u
-M1001 X a_304_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=8.226e+11p ps=5.83e+06u
-M1002 a_443_74# A0 a_304_74# VNB nlowvt w=740000u l=150000u
-+  ad=5.994e+11p pd=3.1e+06u as=4.033e+11p ps=2.57e+06u
-M1003 VPWR S a_27_112# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1004 VPWR a_27_112# a_527_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.9e+11p ps=2.78e+06u
-M1005 a_527_368# A1 a_304_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND S a_27_112# VNB nlowvt w=550000u l=150000u
-+  ad=7.0725e+11p pd=4.91e+06u as=1.5675e+11p ps=1.67e+06u
-M1007 a_304_74# A1 a_226_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1008 a_226_74# S VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_27_112# a_443_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_304_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1011 a_226_368# S VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR S a_226_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_443_74# a_27_112# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_527_368# a_27_112# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 a_226_368# A0 a_304_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_226_74# A1 a_304_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_27_112# S VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X6 a_304_74# A1 a_527_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VGND S a_226_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_27_112# S VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X9 VGND a_304_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_304_74# A0 a_443_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VPWR a_304_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_ms__mux2_2.cdl b/cells/mux2/sky130_fd_sc_ms__mux2_2.cdl
index 3baef02..5f432ce 100644
--- a/cells/mux2/sky130_fd_sc_ms__mux2_2.cdl
+++ b/cells/mux2/sky130_fd_sc_ms__mux2_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__mux2_2 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 xb A0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA01 smdNA0 Sb VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA10 xb A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA11 sndNA1 S VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X xb VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA01 sndPS A0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA11 sndPSb A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X xb VPB pfet_01v8 m=2 w=1.12 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_ms__mux2_2
diff --git a/cells/mux2/sky130_fd_sc_ms__mux2_2.netlist.tsv b/cells/mux2/sky130_fd_sc_ms__mux2_2.netlist.tsv
index 306c8f9..907fc7d 100644
--- a/cells/mux2/sky130_fd_sc_ms__mux2_2.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_ms__mux2_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__mux2_2	A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNA00	MOSFET	xb	A0	smdNA0	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	xb	A1	sndNA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	xb	A0	smdNA0	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	xb	A1	sndNA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2/sky130_fd_sc_ms__mux2_2.spice b/cells/mux2/sky130_fd_sc_ms__mux2_2.spice
index fdee4b7..352ac39 100644
--- a/cells/mux2/sky130_fd_sc_ms__mux2_2.spice
+++ b/cells/mux2/sky130_fd_sc_ms__mux2_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__mux2_2 A0 A1 S VGND VNB VPB VPWR X
-M1000 a_119_368# A0 a_27_368# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=5.6e+11p ps=5.12e+06u
-M1001 a_209_368# A1 a_119_368# VPB pshort w=1e+06u l=180000u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1002 a_119_368# A0 a_38_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.255e+11p pd=2.63e+06u as=4.292e+11p ps=4.12e+06u
-M1003 X a_119_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=9.4915e+11p ps=7.09e+06u
-M1004 a_38_74# a_459_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_209_368# a_459_48# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.133e+12p ps=8.62e+06u
-M1006 a_270_74# A1 a_119_368# VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1007 VPWR S a_27_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR S a_459_48# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1009 VGND S a_270_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_119_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1011 VPWR a_119_368# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND S a_459_48# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1013 VGND a_119_368# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_119_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_119_368# A1 a_209_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VGND a_119_368# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND a_459_48# a_38_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_459_48# S VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 VPWR a_119_368# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VPWR a_459_48# a_209_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_270_74# S VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_459_48# S VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X9 a_27_368# A0 a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_27_368# S VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_38_74# A0 a_119_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_119_368# A1 a_270_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 X a_119_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_ms__mux2_4.cdl b/cells/mux2/sky130_fd_sc_ms__mux2_4.cdl
index 71d0121..19206af 100644
--- a/cells/mux2/sky130_fd_sc_ms__mux2_4.cdl
+++ b/cells/mux2/sky130_fd_sc_ms__mux2_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__mux2_4 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 xb A0 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA01 smdNA0 Sb VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA10 xb A1 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA11 sndNA1 S VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X xb VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA01 sndPS A0 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA11 sndPSb A1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X xb VPB pfet_01v8 m=4 w=1.12 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_ms__mux2_4
diff --git a/cells/mux2/sky130_fd_sc_ms__mux2_4.netlist.tsv b/cells/mux2/sky130_fd_sc_ms__mux2_4.netlist.tsv
index 3df59de..5bc9904 100644
--- a/cells/mux2/sky130_fd_sc_ms__mux2_4.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_ms__mux2_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__mux2_4	A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNA00	MOSFET	xb	A0	smdNA0	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	xb	A1	sndNA1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	xb	A0	smdNA0	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	xb	A1	sndNA1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2/sky130_fd_sc_ms__mux2_4.spice b/cells/mux2/sky130_fd_sc_ms__mux2_4.spice
index 02f2b29..3174cb4 100644
--- a/cells/mux2/sky130_fd_sc_ms__mux2_4.spice
+++ b/cells/mux2/sky130_fd_sc_ms__mux2_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_ms__mux2_4 A0 A1 S VGND VNB VPB VPWR X
-M1000 X a_193_241# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.06535e+12p pd=6.79e+06u as=2.35648e+12p ps=1.609e+07u
-M1001 a_709_119# S VGND VNB nlowvt w=640000u l=150000u
-+  ad=4.224e+11p pd=3.88e+06u as=1.76805e+12p ps=1.249e+07u
-M1002 VGND S a_27_368# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1003 a_937_119# a_27_368# VGND VNB nlowvt w=640000u l=150000u
-+  ad=3.712e+11p pd=3.72e+06u as=0p ps=0u
-M1004 X a_193_241# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_939_391# A1 a_193_241# VPB pshort w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=9.25e+11p ps=7.85e+06u
-M1006 X a_193_241# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.44e+11p pd=4.16e+06u as=0p ps=0u
-M1007 VGND a_27_368# a_937_119# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_193_241# A1 a_939_391# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR S a_27_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1010 a_725_391# S VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=0p ps=0u
-M1011 a_725_391# A0 a_193_241# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_193_241# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR S a_725_391# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_193_241# A1 a_709_119# VNB nlowvt w=640000u l=150000u
-+  ad=9.216e+11p pd=6.72e+06u as=0p ps=0u
-M1015 a_939_391# a_27_368# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_193_241# A0 a_725_391# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_937_119# A0 a_193_241# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_27_368# a_939_391# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_193_241# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_193_241# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_193_241# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_193_241# A0 a_937_119# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_193_241# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND S a_709_119# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_709_119# A1 a_193_241# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_193_241# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR a_27_368# a_939_391# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_725_391# A0 a_193_241# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 a_939_391# a_27_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VGND a_27_368# a_937_119# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 VPWR a_193_241# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_725_391# S VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_193_241# A1 a_939_391# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_709_119# S VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_709_119# A1 a_193_241# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_939_391# A1 a_193_241# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 X a_193_241# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 X a_193_241# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_937_119# A0 a_193_241# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 a_193_241# A0 a_725_391# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X15 VPWR a_193_241# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VGND a_193_241# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_27_368# S VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 VPWR S a_725_391# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X19 a_193_241# A0 a_937_119# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X20 a_193_241# A1 a_709_119# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X21 X a_193_241# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 VGND a_193_241# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_27_368# S VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X24 a_937_119# a_27_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X25 VGND S a_709_119# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/mux2i/sky130_fd_sc_ms__mux2i_1.cdl b/cells/mux2i/sky130_fd_sc_ms__mux2i_1.cdl
index bed54da..9db3f14 100644
--- a/cells/mux2i/sky130_fd_sc_ms__mux2i_1.cdl
+++ b/cells/mux2i/sky130_fd_sc_ms__mux2i_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__mux2i_1 A0 A1 S VGND VNB VPB VPWR Y
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNA00 Y A0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Y A0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA01 smdNA0 Sb VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA10 Y A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA11 sndNA1 S VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 Y A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA01 sndPS A0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__mux2i_1
diff --git a/cells/mux2i/sky130_fd_sc_ms__mux2i_1.netlist.tsv b/cells/mux2i/sky130_fd_sc_ms__mux2i_1.netlist.tsv
index 6f3ff2f..c7490cc 100644
--- a/cells/mux2i/sky130_fd_sc_ms__mux2i_1.netlist.tsv
+++ b/cells/mux2i/sky130_fd_sc_ms__mux2i_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__mux2i_1	A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNA00	MOSFET	Y	A0	smdNA0	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	Y	A1	sndNA1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Y	A0	smdNA0	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	Y	A1	sndNA1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2i/sky130_fd_sc_ms__mux2i_1.spice b/cells/mux2i/sky130_fd_sc_ms__mux2i_1.spice
index f12354b..55b56c9 100644
--- a/cells/mux2i/sky130_fd_sc_ms__mux2i_1.spice
+++ b/cells/mux2i/sky130_fd_sc_ms__mux2i_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__mux2i_1 A0 A1 S VGND VNB VPB VPWR Y
-M1000 Y A0 a_426_74# VNB nlowvt w=740000u l=150000u
-+  ad=5.217e+11p pd=2.89e+06u as=1.776e+11p ps=1.96e+06u
-M1001 a_426_74# a_114_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.6755e+11p ps=3.99e+06u
-M1002 VPWR S a_223_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=5.292e+11p pd=5e+06u as=5.936e+11p ps=5.54e+06u
-M1003 a_402_368# a_114_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=5.936e+11p pd=5.54e+06u as=0p ps=0u
-M1004 a_225_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=4.218e+11p pd=4.1e+06u as=0p ps=0u
-M1005 Y A0 a_223_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1006 a_402_368# A1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_114_74# S VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1008 VGND S a_225_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_114_74# S VPWR VPB pshort w=840000u l=180000u
-+  ad=2.184e+11p pd=2.2e+06u as=0p ps=0u
+X0 a_426_74# A0 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VGND a_114_74# a_426_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 Y A1 a_402_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Y A1 a_225_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR a_114_74# a_402_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VPWR S a_114_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X6 a_223_368# A0 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_225_74# S VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_223_368# S VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VGND S a_114_74# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
 .ends
diff --git a/cells/mux2i/sky130_fd_sc_ms__mux2i_2.cdl b/cells/mux2i/sky130_fd_sc_ms__mux2i_2.cdl
index 0420c55..123ec22 100644
--- a/cells/mux2i/sky130_fd_sc_ms__mux2i_2.cdl
+++ b/cells/mux2i/sky130_fd_sc_ms__mux2i_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__mux2i_2 A0 A1 S VGND VNB VPB VPWR Y
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNA00 Y A0 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Y A0 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA01 smdNA0 Sb VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA10 Y A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA11 sndNA1 S VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 Y A1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA01 sndPS A0 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8 m=1 w=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_ms__mux2i_2
diff --git a/cells/mux2i/sky130_fd_sc_ms__mux2i_2.netlist.tsv b/cells/mux2i/sky130_fd_sc_ms__mux2i_2.netlist.tsv
index 09ca65a..2af404b 100644
--- a/cells/mux2i/sky130_fd_sc_ms__mux2i_2.netlist.tsv
+++ b/cells/mux2i/sky130_fd_sc_ms__mux2i_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__mux2i_2	A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNA00	MOSFET	Y	A0	smdNA0	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	Y	A1	sndNA1	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Y	A0	smdNA0	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	Y	A1	sndNA1	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2i/sky130_fd_sc_ms__mux2i_2.spice b/cells/mux2i/sky130_fd_sc_ms__mux2i_2.spice
index a4360e4..057643b 100644
--- a/cells/mux2i/sky130_fd_sc_ms__mux2i_2.spice
+++ b/cells/mux2i/sky130_fd_sc_ms__mux2i_2.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ms__mux2i_2 A0 A1 S VGND VNB VPB VPWR Y
-M1000 VPWR a_922_72# a_343_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.58023e+12p pd=1.017e+07u as=1.0304e+12p ps=6.32e+06u
-M1001 VGND a_922_72# a_115_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.10195e+12p pd=8.18e+06u as=5.18e+11p ps=4.36e+06u
-M1002 Y A0 a_121_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.1312e+12p pd=8.74e+06u as=6.496e+11p ps=5.64e+06u
-M1003 Y A1 a_343_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_922_72# S VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1005 a_337_74# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=7.8555e+11p pd=5.15e+06u as=8.4255e+11p ps=6.93e+06u
-M1006 a_121_368# S VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR S a_121_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_115_74# A0 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_922_72# S VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1010 a_337_74# S VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_121_368# A0 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_343_368# a_922_72# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND S a_337_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_343_368# A1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A1 a_337_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A0 a_115_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_115_74# a_922_72# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_115_74# A0 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 Y A1 a_343_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y A0 a_121_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VPWR S a_121_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR S a_922_72# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_337_74# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_121_368# S VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND S a_337_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VGND a_922_72# a_115_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 Y A1 a_337_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND S a_922_72# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 VPWR a_922_72# a_343_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_343_368# a_922_72# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_337_74# S VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 Y A0 a_115_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_343_368# A1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_115_74# a_922_72# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_121_368# A0 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/mux2i/sky130_fd_sc_ms__mux2i_4.cdl b/cells/mux2i/sky130_fd_sc_ms__mux2i_4.cdl
index 4e389f0..ae73ba8 100644
--- a/cells/mux2i/sky130_fd_sc_ms__mux2i_4.cdl
+++ b/cells/mux2i/sky130_fd_sc_ms__mux2i_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__mux2i_4 A0 A1 S VGND VNB VPB VPWR Y
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNA00 Y A0 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Y A0 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA01 smdNA0 Sb VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA10 Y A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA11 sndNA1 S VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 Y A1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA01 sndPS A0 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__mux2i_4
diff --git a/cells/mux2i/sky130_fd_sc_ms__mux2i_4.netlist.tsv b/cells/mux2i/sky130_fd_sc_ms__mux2i_4.netlist.tsv
index d9fb1ed..ee9cca4 100644
--- a/cells/mux2i/sky130_fd_sc_ms__mux2i_4.netlist.tsv
+++ b/cells/mux2i/sky130_fd_sc_ms__mux2i_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__mux2i_4	A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNA00	MOSFET	Y	A0	smdNA0	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	Y	A1	sndNA1	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Y	A0	smdNA0	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	Y	A1	sndNA1	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2i/sky130_fd_sc_ms__mux2i_4.spice b/cells/mux2i/sky130_fd_sc_ms__mux2i_4.spice
index 212d6fb..1965bf7 100644
--- a/cells/mux2i/sky130_fd_sc_ms__mux2i_4.spice
+++ b/cells/mux2i/sky130_fd_sc_ms__mux2i_4.spice
@@ -16,74 +16,39 @@
 
 
 .subckt sky130_fd_sc_ms__mux2i_4 A0 A1 S VGND VNB VPB VPWR Y
-M1000 Y A1 a_114_85# VNB nlowvt w=740000u l=150000u
-+  ad=1.0767e+12p pd=1.031e+07u as=8.917e+11p ps=8.33e+06u
-M1001 a_481_368# A0 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=1.3104e+12p pd=1.13e+07u as=1.6576e+12p ps=1.416e+07u
-M1002 VPWR a_1030_268# a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=2.387e+12p pd=1.732e+07u as=1.2992e+12p ps=1.128e+07u
-M1003 a_481_368# S VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR S a_481_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_114_85# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR S a_481_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_475_85# A0 Y VNB nlowvt w=740000u l=150000u
-+  ad=8.806e+11p pd=8.3e+06u as=0p ps=0u
-M1008 a_119_368# A1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A1 a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_114_85# S VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.795e+12p ps=1.331e+07u
-M1011 a_119_368# A1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_119_368# a_1030_268# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_475_85# a_1030_268# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_1030_268# a_475_85# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A1 a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A0 a_481_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_114_85# S VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A0 a_481_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_481_368# A0 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_1030_268# a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_119_368# a_1030_268# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_114_85# A1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y A1 a_114_85# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1030_268# S VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.627e+11p pd=2.19e+06u as=0p ps=0u
-M1025 VGND S a_114_85# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_1030_268# a_475_85# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1030_268# S VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1028 VGND S a_114_85# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_475_85# a_1030_268# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y A0 a_475_85# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y A0 a_475_85# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_481_368# S VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR S a_1030_268# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_475_85# A0 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_114_85# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VGND a_1030_268# a_475_85# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_481_368# A0 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_475_85# A0 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_119_368# a_1030_268# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_114_85# S VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_119_368# A1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y A0 a_481_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_475_85# a_1030_268# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 Y A0 a_475_85# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_119_368# A1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VPWR S a_481_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_475_85# A0 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 Y A0 a_481_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_481_368# A0 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_481_368# S VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 Y A1 a_114_85# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 Y A0 a_475_85# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 VPWR a_1030_268# a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 Y A1 a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 VPWR a_1030_268# a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 Y A1 a_114_85# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 a_119_368# a_1030_268# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_114_85# A1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_475_85# a_1030_268# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 Y A1 a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 VGND S a_114_85# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 VGND S a_1030_268# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 VGND a_1030_268# a_475_85# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_481_368# S VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X30 VGND S a_114_85# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 VPWR S a_481_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 VPWR S a_1030_268# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X33 a_1030_268# S VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X34 a_114_85# S VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/mux4/sky130_fd_sc_ms__mux4_1.cdl b/cells/mux4/sky130_fd_sc_ms__mux4_1.cdl
index d9d5d02..ab04674 100644
--- a/cells/mux4/sky130_fd_sc_ms__mux4_1.cdl
+++ b/cells/mux4/sky130_fd_sc_ms__mux4_1.cdl
@@ -16,56 +16,56 @@
 
 .SUBCKT sky130_fd_sc_ms__mux4_1 A0 A1 A2 A3 S0 S1 VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I A2:I A3:I S0:I S1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 sndNS0ba0 S0b VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA00 sndNS0ba0 S0b VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMNA01 VGND A0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA01 VGND A0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA10 sndNS0a1 S0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA10 sndNS0a1 S0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA11 VGND A1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA20 sndNS0ba2 S0b VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA11 VGND A1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA21 VGND A2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA30 sndNS0a3 S0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA20 sndNS0ba2 S0b VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMNA21 VGND A2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA31 VGND A3 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNs1o xb S1b VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNs2o xb S1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIN1 VGND S1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIN2 VGND S0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIN4 VGND xb VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA00 sndPA0a0 A0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA30 sndNS0a3 S0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA01 xlowb S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA10 sndPA1a1 A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA31 VGND A3 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA11 xlowb S0b VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA20 sndPA2a2 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNs1o xb S1b VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA21 xhib S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA30 sndPA3a3 A3 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNs2o xb S1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA31 xhib S0b VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN1 VGND S1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIN2 VGND S0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIN4 VGND xb VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA00 sndPA0a0 A0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA01 xlowb S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA10 sndPA1a1 A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA11 xlowb S0b VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA20 sndPA2a2 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA21 xhib S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMPs1o xb S1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA30 sndPA3a3 A3 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA31 xhib S0b VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPs1o xb S1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMPs2o xb S1b VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPs2o xb S1b VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMIP1 VPWR S1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 VPWR S1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMIP2 VPWR S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 VPWR S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMIP4 VPWR xb VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 VPWR xb VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_ms__mux4_1
diff --git a/cells/mux4/sky130_fd_sc_ms__mux4_1.netlist.tsv b/cells/mux4/sky130_fd_sc_ms__mux4_1.netlist.tsv
index bc65163..e5e4739 100644
--- a/cells/mux4/sky130_fd_sc_ms__mux4_1.netlist.tsv
+++ b/cells/mux4/sky130_fd_sc_ms__mux4_1.netlist.tsv
@@ -1,28 +1,28 @@
 sky130_fd_sc_ms__mux4_1	A0:I A1:I A2:I A3:I S0:I S1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNA00	MOSFET	sndNS0ba0	S0b	xlowb	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs2o	MOSFET	xb	S1	xhib	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN1	MOSFET	VGND	S1	S1b	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN2	MOSFET	VGND	S0	S0b	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN4	MOSFET	VGND	xb	X	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs1o	MOSFET	xb	S1	xlowb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs2o	MOSFET	xb	S1b	xhib	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP1	MOSFET	VPWR	S1	S1b	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP2	MOSFET	VPWR	S0	S0b	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP4	MOSFET	VPWR	xb	X	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA00	MOSFET	sndNS0ba0	S0b	xlowb	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs2o	MOSFET	xb	S1	xhib	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN1	MOSFET	VGND	S1	S1b	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN2	MOSFET	VGND	S0	S0b	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN4	MOSFET	VGND	xb	X	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs1o	MOSFET	xb	S1	xlowb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs2o	MOSFET	xb	S1b	xhib	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP1	MOSFET	VPWR	S1	S1b	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP2	MOSFET	VPWR	S0	S0b	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP4	MOSFET	VPWR	xb	X	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/mux4/sky130_fd_sc_ms__mux4_1.spice b/cells/mux4/sky130_fd_sc_ms__mux4_1.spice
index 45bc263..c3cf077 100644
--- a/cells/mux4/sky130_fd_sc_ms__mux4_1.spice
+++ b/cells/mux4/sky130_fd_sc_ms__mux4_1.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_ms__mux4_1 A0 A1 A2 A3 S0 S1 VGND VNB VPB VPWR X
-M1000 VPWR A1 a_540_341# VPB pshort w=1e+06u l=180000u
-+  ad=1.87058e+12p pd=1.254e+07u as=3.3e+11p ps=2.66e+06u
-M1001 VGND A1 a_450_74# VNB nlowvt w=640000u l=150000u
-+  ad=1.2058e+12p pd=9.01e+06u as=4.8e+11p ps=2.78e+06u
-M1002 a_766_341# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=3.6525e+11p pd=3.11e+06u as=0p ps=0u
-M1003 a_979_74# S0 a_846_74# VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=7.84075e+11p ps=5.5e+06u
-M1004 a_1338_125# S1 a_846_74# VNB nlowvt w=640000u l=150000u
-+  ad=1.856e+11p pd=1.86e+06u as=0p ps=0u
-M1005 a_1068_387# a_27_74# a_846_74# VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=1.155e+12p ps=6.31e+06u
-M1006 a_846_74# a_1396_99# a_1338_125# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.2e+11p ps=2.64e+06u
-M1007 a_1338_125# S1 a_342_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.5e+11p ps=5.1e+06u
-M1008 a_846_74# S0 a_766_341# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR S0 a_27_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1010 a_342_74# S0 a_258_341# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=7.8e+11p ps=3.56e+06u
-M1011 VGND S1 a_1396_99# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1012 VPWR A3 a_1068_387# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_540_341# a_27_74# a_342_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_264_74# A0 VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1015 a_342_74# a_27_74# a_264_74# VNB nlowvt w=640000u l=150000u
-+  ad=4.32e+11p pd=3.91e+06u as=0p ps=0u
-M1016 VPWR S1 a_1396_99# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.3e+11p ps=2.66e+06u
-M1017 X a_1338_125# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1018 X a_1338_125# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1019 a_450_74# S0 a_342_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_258_341# A0 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND S0 a_27_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1022 a_846_74# a_27_74# a_768_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1023 a_768_74# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_342_74# a_1396_99# a_1338_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A3 a_979_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_846_74# S0 a_979_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 a_1338_125# a_1396_99# a_342_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_27_74# S0 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 a_540_341# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_1396_99# S1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_846_74# a_27_74# a_1068_387# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_1068_387# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_264_74# a_27_74# a_342_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_846_74# S1 a_1338_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_342_74# a_27_74# a_540_341# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 VGND A0 a_264_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 a_342_74# S0 a_450_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 a_766_341# S0 a_846_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 VPWR A0 a_258_341# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 a_979_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 VPWR A2 a_766_341# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 a_1396_99# S1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X17 VPWR a_1338_125# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 a_768_74# a_27_74# a_846_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X19 a_342_74# S1 a_1338_125# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X20 VGND a_1338_125# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 VGND A2 a_768_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X22 a_258_341# S0 a_342_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X23 a_450_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X24 a_1338_125# a_1396_99# a_846_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X25 a_27_74# S0 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/mux4/sky130_fd_sc_ms__mux4_2.cdl b/cells/mux4/sky130_fd_sc_ms__mux4_2.cdl
index c56c30e..de425c9 100644
--- a/cells/mux4/sky130_fd_sc_ms__mux4_2.cdl
+++ b/cells/mux4/sky130_fd_sc_ms__mux4_2.cdl
@@ -16,56 +16,56 @@
 
 .SUBCKT sky130_fd_sc_ms__mux4_2 A0 A1 A2 A3 S0 S1 VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I A2:I A3:I S0:I S1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 sndNS0ba0 S0b VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNA00 sndNS0ba0 S0b VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMNA01 VGND A0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA01 VGND A0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA10 sndNS0a1 S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNA10 sndNS0a1 S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA11 VGND A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA20 sndNS0ba2 S0b VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNA11 VGND A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA21 VGND A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA30 sndNS0a3 S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNA20 sndNS0ba2 S0b VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMNA21 VGND A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA31 VGND A3 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNs1o xb S1b VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNs2o xb S1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIN1 VGND S1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIN2 VGND S0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIN4 VGND xb VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA00 sndPA0a0 A0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA30 sndNS0a3 S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA01 xlowb S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA10 sndPA1a1 A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA31 VGND A3 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA11 xlowb S0b VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA20 sndPA2a2 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNs1o xb S1b VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA21 xhib S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA30 sndPA3a3 A3 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNs2o xb S1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA31 xhib S0b VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN1 VGND S1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIN2 VGND S0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIN4 VGND xb VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA00 sndPA0a0 A0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA01 xlowb S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA10 sndPA1a1 A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA11 xlowb S0b VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA20 sndPA2a2 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA21 xhib S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMPs1o xb S1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA30 sndPA3a3 A3 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA31 xhib S0b VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPs1o xb S1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMPs2o xb S1b VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPs2o xb S1b VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMIP1 VPWR S1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 VPWR S1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMIP2 VPWR S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 VPWR S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMIP4 VPWR xb VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 VPWR xb VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_ms__mux4_2
diff --git a/cells/mux4/sky130_fd_sc_ms__mux4_2.netlist.tsv b/cells/mux4/sky130_fd_sc_ms__mux4_2.netlist.tsv
index e327953..8a2f4ec 100644
--- a/cells/mux4/sky130_fd_sc_ms__mux4_2.netlist.tsv
+++ b/cells/mux4/sky130_fd_sc_ms__mux4_2.netlist.tsv
@@ -1,28 +1,28 @@
 sky130_fd_sc_ms__mux4_2	A0:I A1:I A2:I A3:I S0:I S1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNA00	MOSFET	sndNS0ba0	S0b	xlowb	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs2o	MOSFET	xb	S1	xhib	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN1	MOSFET	VGND	S1	S1b	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN2	MOSFET	VGND	S0	S0b	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN4	MOSFET	VGND	xb	X	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs1o	MOSFET	xb	S1	xlowb	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs2o	MOSFET	xb	S1b	xhib	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP1	MOSFET	VPWR	S1	S1b	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP2	MOSFET	VPWR	S0	S0b	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP4	MOSFET	VPWR	xb	X	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA00	MOSFET	sndNS0ba0	S0b	xlowb	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs2o	MOSFET	xb	S1	xhib	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN1	MOSFET	VGND	S1	S1b	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN2	MOSFET	VGND	S0	S0b	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN4	MOSFET	VGND	xb	X	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs1o	MOSFET	xb	S1	xlowb	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs2o	MOSFET	xb	S1b	xhib	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP1	MOSFET	VPWR	S1	S1b	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP2	MOSFET	VPWR	S0	S0b	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP4	MOSFET	VPWR	xb	X	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/mux4/sky130_fd_sc_ms__mux4_2.spice b/cells/mux4/sky130_fd_sc_ms__mux4_2.spice
index 924323a..baacc62 100644
--- a/cells/mux4/sky130_fd_sc_ms__mux4_2.spice
+++ b/cells/mux4/sky130_fd_sc_ms__mux4_2.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__mux4_2 A0 A1 A2 A3 S0 S1 VGND VNB VPB VPWR X
-M1000 VGND S0 a_31_94# VNB nlowvt w=640000u l=150000u
-+  ad=1.6907e+12p pd=1.216e+07u as=1.824e+11p ps=1.85e+06u
-M1001 VPWR S0 a_31_94# VPB pshort w=1e+06u l=180000u
-+  ad=2.256e+12p pd=1.486e+07u as=2.8e+11p ps=2.56e+06u
-M1002 a_1155_392# S0 a_909_74# VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=7.85e+11p ps=5.57e+06u
-M1003 a_1429_74# S1 a_333_74# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=8.45e+11p ps=5.69e+06u
-M1004 a_1047_74# a_31_94# a_909_74# VNB nlowvt w=740000u l=150000u
-+  ad=5.772e+11p pd=3.04e+06u as=6.068e+11p ps=4.6e+06u
-M1005 a_909_74# a_31_94# a_843_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=6.9e+11p ps=3.38e+06u
-M1006 a_909_74# a_1500_94# a_1429_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_333_74# a_1500_94# a_1429_74# VNB nlowvt w=740000u l=150000u
-+  ad=7.437e+11p pd=4.97e+06u as=3.0295e+11p ps=2.65e+06u
-M1008 a_621_392# S0 a_333_74# VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1009 VGND S1 a_1500_94# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.76725e+11p ps=2.15e+06u
-M1010 a_1429_74# S1 a_909_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_333_74# S0 a_255_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1012 VGND A2 a_1047_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_255_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_507_74# a_31_94# a_333_74# VNB nlowvt w=740000u l=150000u
-+  ad=5.772e+11p pd=3.04e+06u as=0p ps=0u
-M1015 X a_1429_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1016 a_909_74# S0 a_831_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1017 VPWR A0 a_621_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_843_392# A3 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A2 a_1155_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_831_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_1429_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_1429_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1023 a_333_74# a_31_94# a_267_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=8.7e+11p ps=3.74e+06u
-M1024 VGND A0 a_507_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_1429_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_267_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR S1 a_1500_94# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=4.1e+11p ps=2.82e+06u
+X0 a_909_74# S0 a_1155_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_255_74# S0 a_333_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VGND a_1429_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND A1 a_255_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VGND A3 a_831_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_843_392# a_31_94# a_909_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_1429_74# a_1500_94# a_333_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_333_74# S1 a_1429_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_909_74# a_31_94# a_1047_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_1047_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VPWR A1 a_267_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_1500_94# S1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 a_831_74# S0 a_909_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_267_392# a_31_94# a_333_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 VPWR A3 a_843_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X15 a_1500_94# S1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X16 VPWR a_1429_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_333_74# S0 a_621_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 a_333_74# a_31_94# a_507_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_507_74# A0 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_1155_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X21 X a_1429_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_621_392# A0 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X23 a_31_94# S0 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X24 a_909_74# S1 a_1429_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 X a_1429_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 a_31_94# S0 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X27 a_1429_74# a_1500_94# a_909_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/mux4/sky130_fd_sc_ms__mux4_4.cdl b/cells/mux4/sky130_fd_sc_ms__mux4_4.cdl
index d826521..b1619ae 100644
--- a/cells/mux4/sky130_fd_sc_ms__mux4_4.cdl
+++ b/cells/mux4/sky130_fd_sc_ms__mux4_4.cdl
@@ -16,56 +16,56 @@
 
 .SUBCKT sky130_fd_sc_ms__mux4_4 A0 A1 A2 A3 S0 S1 VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I A2:I A3:I S0:I S1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 sndNS0ba0 S0b VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA00 sndNS0ba0 S0b VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMNA01 VGND A0 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA01 VGND A0 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA10 sndNS0a1 S0 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA10 sndNS0a1 S0 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA11 VGND A1 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA20 sndNS0ba2 S0b VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA11 VGND A1 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA21 VGND A2 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA30 sndNS0a3 S0 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA20 sndNS0ba2 S0b VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMNA21 VGND A2 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA31 VGND A3 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNs1o xb S1b VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNs2o xb S1 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIN1 VGND S1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIN2 VGND S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIN4 VGND xb VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA00 sndPA0a0 A0 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA30 sndNS0a3 S0 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA01 xlowb S0 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA10 sndPA1a1 A1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA31 VGND A3 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA11 xlowb S0b VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA20 sndPA2a2 A2 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNs1o xb S1b VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA21 xhib S0 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA30 sndPA3a3 A3 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNs2o xb S1 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA31 xhib S0b VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN1 VGND S1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIN2 VGND S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIN4 VGND xb VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA00 sndPA0a0 A0 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA01 xlowb S0 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA10 sndPA1a1 A1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA11 xlowb S0b VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA20 sndPA2a2 A2 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA21 xhib S0 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMPs1o xb S1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA30 sndPA3a3 A3 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA31 xhib S0b VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPs1o xb S1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMPs2o xb S1b VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPs2o xb S1b VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMIP1 VPWR S1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 VPWR S1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMIP2 VPWR S0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 VPWR S0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMIP4 VPWR xb VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 VPWR xb VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_ms__mux4_4
diff --git a/cells/mux4/sky130_fd_sc_ms__mux4_4.netlist.tsv b/cells/mux4/sky130_fd_sc_ms__mux4_4.netlist.tsv
index a9f16db..dc53cd5 100644
--- a/cells/mux4/sky130_fd_sc_ms__mux4_4.netlist.tsv
+++ b/cells/mux4/sky130_fd_sc_ms__mux4_4.netlist.tsv
@@ -1,28 +1,28 @@
 sky130_fd_sc_ms__mux4_4	A0:I A1:I A2:I A3:I S0:I S1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNA00	MOSFET	sndNS0ba0	S0b	xlowb	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs2o	MOSFET	xb	S1	xhib	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN1	MOSFET	VGND	S1	S1b	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN2	MOSFET	VGND	S0	S0b	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN4	MOSFET	VGND	xb	X	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs1o	MOSFET	xb	S1	xlowb	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs2o	MOSFET	xb	S1b	xhib	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP1	MOSFET	VPWR	S1	S1b	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP2	MOSFET	VPWR	S0	S0b	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP4	MOSFET	VPWR	xb	X	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA00	MOSFET	sndNS0ba0	S0b	xlowb	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs2o	MOSFET	xb	S1	xhib	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN1	MOSFET	VGND	S1	S1b	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN2	MOSFET	VGND	S0	S0b	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN4	MOSFET	VGND	xb	X	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs1o	MOSFET	xb	S1	xlowb	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs2o	MOSFET	xb	S1b	xhib	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP1	MOSFET	VPWR	S1	S1b	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP2	MOSFET	VPWR	S0	S0b	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP4	MOSFET	VPWR	xb	X	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/mux4/sky130_fd_sc_ms__mux4_4.spice b/cells/mux4/sky130_fd_sc_ms__mux4_4.spice
index 2905f18..07e4846 100644
--- a/cells/mux4/sky130_fd_sc_ms__mux4_4.spice
+++ b/cells/mux4/sky130_fd_sc_ms__mux4_4.spice
@@ -16,108 +16,56 @@
 
 
 .subckt sky130_fd_sc_ms__mux4_4 A0 A1 A2 A3 S0 S1 VGND VNB VPB VPWR X
-M1000 a_509_392# S0 a_299_392# VPB pshort w=1e+06u l=180000u
-+  ad=1.19e+12p pd=1.038e+07u as=6.15e+11p ps=5.23e+06u
-M1001 a_1468_377# S0 a_1191_121# VPB pshort w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=1.15e+12p ps=1.03e+07u
-M1002 a_1278_121# a_758_306# a_1191_121# VNB nlowvt w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=9.2755e+11p ps=8.21e+06u
-M1003 a_119_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=3.48045e+12p ps=2.828e+07u
-M1004 VPWR A1 a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_1288_377# A3 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=0p ps=0u
-M1006 a_1191_121# a_758_306# a_1278_121# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A0 a_299_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1191_121# S0 a_1468_377# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_509_392# S0 a_114_126# VNB nlowvt w=640000u l=150000u
-+  ad=8.5705e+11p pd=8.11e+06u as=3.872e+11p ps=3.77e+06u
-M1010 X a_2199_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1011 a_299_392# A0 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1450_121# S0 a_1191_121# VNB nlowvt w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=0p ps=0u
-M1013 VPWR S0 a_758_306# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1014 VGND S1 a_2489_347# VNB nlowvt w=740000u l=150000u
-+  ad=2.4642e+12p pd=2.151e+07u as=2.109e+11p ps=2.05e+06u
-M1015 a_2199_74# a_2489_347# a_509_392# VNB nlowvt w=640000u l=150000u
-+  ad=8.576e+11p pd=6.52e+06u as=0p ps=0u
-M1016 VGND S0 a_758_306# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1017 a_1191_121# S1 a_2199_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1450_121# A3 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_2199_74# S1 a_1191_121# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_2199_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1021 a_1278_121# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_299_126# A0 VGND VNB nlowvt w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=0p ps=0u
-M1023 VGND A0 a_299_126# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR A3 a_1288_377# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A1 a_114_126# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 X a_2199_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_2199_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1191_121# a_2489_347# a_2199_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=9.3e+11p ps=7.86e+06u
-M1029 a_2199_74# a_2489_347# a_1191_121# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_2199_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A3 a_1450_121# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_2199_74# S1 a_509_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_114_126# A1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR a_2199_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_2199_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1468_377# A2 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_509_392# S1 a_2199_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR A2 a_1468_377# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_299_126# a_758_306# a_509_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND A2 a_1278_121# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_1191_121# S0 a_1450_121# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_299_392# S0 a_509_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_509_392# a_758_306# a_299_126# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VPWR S1 a_2489_347# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.528e+11p ps=2.87e+06u
-M1045 a_119_392# a_758_306# a_509_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_1288_377# a_758_306# a_1191_121# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_114_126# S0 a_509_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_509_392# a_2489_347# a_2199_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 a_509_392# a_758_306# a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 a_1191_121# a_758_306# a_1288_377# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 X a_2199_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_2199_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_2199_74# a_2489_347# a_509_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_119_392# a_758_306# a_509_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 a_509_392# S1 a_2199_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VPWR A0 a_299_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_1288_377# A3 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 X a_2199_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_1450_121# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_1278_121# a_758_306# a_1191_121# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_1191_121# a_758_306# a_1288_377# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 VGND A2 a_1278_121# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 a_2199_74# a_2489_347# a_1191_121# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 a_1191_121# S0 a_1468_377# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 a_509_392# a_2489_347# a_2199_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 a_299_392# A0 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X15 a_509_392# a_758_306# a_299_126# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X16 a_114_126# S0 a_509_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 X a_2199_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 a_1468_377# A2 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X19 a_509_392# S0 a_114_126# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X20 a_1450_121# S0 a_1191_121# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X21 VGND A3 a_1450_121# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X22 a_1191_121# S0 a_1450_121# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X23 a_2489_347# S1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_1191_121# a_2489_347# a_2199_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X25 a_1278_121# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X26 a_758_306# S0 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 a_2199_74# S1 a_1191_121# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X28 a_509_392# a_758_306# a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X29 VGND A1 a_114_126# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X30 X a_2199_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 a_119_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X32 VGND A0 a_299_126# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X33 VPWR a_2199_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X34 a_299_126# a_758_306# a_509_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X35 a_2489_347# S1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X36 a_1191_121# S1 a_2199_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X37 a_114_126# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X38 X a_2199_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X39 a_1288_377# a_758_306# a_1191_121# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X40 a_509_392# S0 a_299_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X41 VGND a_2199_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X42 VGND a_2199_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X43 a_1468_377# S0 a_1191_121# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X44 VPWR A3 a_1288_377# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X45 VPWR A2 a_1468_377# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X46 a_2199_74# S1 a_509_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X47 a_299_126# A0 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X48 a_758_306# S0 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X49 a_1191_121# a_758_306# a_1278_121# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X50 VPWR A1 a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X51 a_299_392# S0 a_509_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_1.cdl b/cells/nand2/sky130_fd_sc_ms__nand2_1.cdl
index 2ee6f33..1f688a5 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_1.cdl
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ms__nand2_1 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=1 w=1.12 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 pshort m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPB pfet_01v8 m=1 w=1.12 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_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nand2_1
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_1.netlist.tsv b/cells/nand2/sky130_fd_sc_ms__nand2_1.netlist.tsv
index b1864a0..05c668e 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_1.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ms__nand2_1	A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_1.spice b/cells/nand2/sky130_fd_sc_ms__nand2_1.spice
index 6d48700..45fd354 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_1.spice
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_ms__nand2_1 A B VGND VNB VPB VPWR Y
-M1000 Y A a_117_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.776e+11p ps=1.96e+06u
-M1001 Y B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=6.048e+11p ps=5.56e+06u
-M1002 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_117_74# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
+X0 a_117_74# A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VGND B a_117_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_2.cdl b/cells/nand2/sky130_fd_sc_ms__nand2_2.cdl
index f3bcca4..3bd9bb6 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_2.cdl
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ms__nand2_2 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPB pfet_01v8 m=2 w=1.12 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_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nand2_2
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_2.netlist.tsv b/cells/nand2/sky130_fd_sc_ms__nand2_2.netlist.tsv
index af8ee8a..5101692 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_2.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ms__nand2_2	A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_2.spice b/cells/nand2/sky130_fd_sc_ms__nand2_2.spice
index 67824f9..01db412 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_2.spice
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_2.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__nand2_2 A B VGND VNB VPB VPWR Y
-M1000 Y B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=9.408e+11p ps=8.4e+06u
-M1001 VPWR B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.442e+11p pd=2.14e+06u as=6.438e+11p ps=6.18e+06u
-M1003 a_27_74# A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_74# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.442e+11p ps=2.14e+06u
-M1006 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_27_74# A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 Y A a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_27_74# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_4.cdl b/cells/nand2/sky130_fd_sc_ms__nand2_4.cdl
index 69a6a18..39da694 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_4.cdl
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ms__nand2_4 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPB pfet_01v8 m=2 w=1.12 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_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nand2_4
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_4.netlist.tsv b/cells/nand2/sky130_fd_sc_ms__nand2_4.netlist.tsv
index ef8ae36..b3c6599 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_4.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ms__nand2_4	A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_4.spice b/cells/nand2/sky130_fd_sc_ms__nand2_4.spice
index 9c76f74..da3dd3e 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_4.spice
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_4.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__nand2_4 A B VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=1.0472e+12p pd=8.59e+06u as=2.6824e+12p ps=9.27e+06u
-M1001 Y B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=5.365e+11p pd=4.41e+06u as=1.1581e+12p ps=1.053e+07u
-M1003 a_27_74# A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND B a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1005 Y A a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_74# A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_74# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_74# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_27_74# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 Y B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_27_74# A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 Y A a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_27_74# A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_27_74# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_8.cdl b/cells/nand2/sky130_fd_sc_ms__nand2_8.cdl
index ef10b4a..6058fc3 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_8.cdl
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ms__nand2_8 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=4 w=1.12 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 pshort m=4 w=1.12 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 nlowvt m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPB pfet_01v8 m=4 w=1.12 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_lvt m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=8 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nand2_8
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_8.netlist.tsv b/cells/nand2/sky130_fd_sc_ms__nand2_8.netlist.tsv
index 822be69..602b638 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_8.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ms__nand2_8	A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nlowvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8_lvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8_lvt	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_8.spice b/cells/nand2/sky130_fd_sc_ms__nand2_8.spice
index b2d156e..cce6a5c 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_8.spice
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_8.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__nand2_8 A B VGND VNB VPB VPWR Y
-M1000 VGND B a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.0656e+12p pd=8.8e+06u as=2.14795e+12p ps=1.918e+07u
-M1001 a_27_74# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND B a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_74# A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=8.288e+11p ps=8.16e+06u
-M1004 a_27_74# A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=5.0008e+12p pd=2.237e+07u as=1.3216e+12p ps=1.132e+07u
-M1007 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_74# A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_74# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_74# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_74# A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 Y A a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VPWR B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VPWR B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_27_74# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 Y A a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_27_74# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 Y B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_27_74# A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 Y A a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_27_74# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_27_74# A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_27_74# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 Y B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_27_74# A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_27_74# A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 Y A a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/nand2b/sky130_fd_sc_ms__nand2b_1.cdl b/cells/nand2b/sky130_fd_sc_ms__nand2b_1.cdl
index 23d4d65..9825d5d 100644
--- a/cells/nand2b/sky130_fd_sc_ms__nand2b_1.cdl
+++ b/cells/nand2b/sky130_fd_sc_ms__nand2b_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__nand2b_1 A_N B VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=1 w=1.12 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 pshort m=1 w=1.12 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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nand2b_1
diff --git a/cells/nand2b/sky130_fd_sc_ms__nand2b_1.netlist.tsv b/cells/nand2b/sky130_fd_sc_ms__nand2b_1.netlist.tsv
index 303e77f..dfa0fb6 100644
--- a/cells/nand2b/sky130_fd_sc_ms__nand2b_1.netlist.tsv
+++ b/cells/nand2b/sky130_fd_sc_ms__nand2b_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__nand2b_1	A_N:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2b/sky130_fd_sc_ms__nand2b_1.spice b/cells/nand2b/sky130_fd_sc_ms__nand2b_1.spice
index 1e6b430..cdfbc3f 100644
--- a/cells/nand2b/sky130_fd_sc_ms__nand2b_1.spice
+++ b/cells/nand2b/sky130_fd_sc_ms__nand2b_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ms__nand2b_1 A_N B VGND VNB VPB VPWR Y
-M1000 Y a_27_112# a_269_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.182e+11p pd=2.34e+06u as=1.776e+11p ps=1.96e+06u
-M1001 a_269_74# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.4825e+11p ps=2.73e+06u
-M1002 VPWR A_N a_27_112# VPB pshort w=840000u l=180000u
-+  ad=8.47e+11p pd=6.03e+06u as=2.352e+11p ps=2.24e+06u
-M1003 VGND A_N a_27_112# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1004 Y B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.584e+11p pd=2.88e+06u as=0p ps=0u
-M1005 VPWR a_27_112# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_112# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 a_27_112# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X2 a_269_74# a_27_112# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VGND B a_269_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 Y a_27_112# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/nand2b/sky130_fd_sc_ms__nand2b_2.cdl b/cells/nand2b/sky130_fd_sc_ms__nand2b_2.cdl
index 14120d3..46ae001 100644
--- a/cells/nand2b/sky130_fd_sc_ms__nand2b_2.cdl
+++ b/cells/nand2b/sky130_fd_sc_ms__nand2b_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__nand2b_2 A_N B VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=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_ms__nand2b_2
diff --git a/cells/nand2b/sky130_fd_sc_ms__nand2b_2.netlist.tsv b/cells/nand2b/sky130_fd_sc_ms__nand2b_2.netlist.tsv
index fc9cbb6..14941d1 100644
--- a/cells/nand2b/sky130_fd_sc_ms__nand2b_2.netlist.tsv
+++ b/cells/nand2b/sky130_fd_sc_ms__nand2b_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__nand2b_2	A_N:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	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_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2b/sky130_fd_sc_ms__nand2b_2.spice b/cells/nand2b/sky130_fd_sc_ms__nand2b_2.spice
index c997e47..159aeca 100644
--- a/cells/nand2b/sky130_fd_sc_ms__nand2b_2.spice
+++ b/cells/nand2b/sky130_fd_sc_ms__nand2b_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__nand2b_2 A_N B VGND VNB VPB VPWR Y
-M1000 Y a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=1.5068e+12p ps=9.46e+06u
-M1001 VPWR a_27_74# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND B a_242_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.7765e+11p pd=3.86e+06u as=6.2445e+11p ps=6.14e+06u
-M1003 VPWR A_N a_27_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1004 Y B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_27_74# a_242_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1007 a_242_74# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A_N a_27_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1009 a_242_74# a_27_74# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_27_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y a_27_74# a_242_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND B a_242_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_242_74# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_27_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 Y a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_27_74# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_242_74# a_27_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nand2b/sky130_fd_sc_ms__nand2b_4.cdl b/cells/nand2b/sky130_fd_sc_ms__nand2b_4.cdl
index b510415..f5f8973 100644
--- a/cells/nand2b/sky130_fd_sc_ms__nand2b_4.cdl
+++ b/cells/nand2b/sky130_fd_sc_ms__nand2b_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__nand2b_4 A_N B VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nand2b_4
diff --git a/cells/nand2b/sky130_fd_sc_ms__nand2b_4.netlist.tsv b/cells/nand2b/sky130_fd_sc_ms__nand2b_4.netlist.tsv
index d835cd9..9841d5b 100644
--- a/cells/nand2b/sky130_fd_sc_ms__nand2b_4.netlist.tsv
+++ b/cells/nand2b/sky130_fd_sc_ms__nand2b_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__nand2b_4	A_N:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2b/sky130_fd_sc_ms__nand2b_4.spice b/cells/nand2b/sky130_fd_sc_ms__nand2b_4.spice
index 8271964..3381179 100644
--- a/cells/nand2b/sky130_fd_sc_ms__nand2b_4.spice
+++ b/cells/nand2b/sky130_fd_sc_ms__nand2b_4.spice
@@ -16,34 +16,19 @@
 
 
 .subckt sky130_fd_sc_ms__nand2b_4 A_N B VGND VNB VPB VPWR Y
-M1000 Y a_31_74# a_243_74# VNB nlowvt w=740000u l=150000u
-+  ad=5.143e+11p pd=4.35e+06u as=1.0434e+12p ps=1.022e+07u
-M1001 a_243_74# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.0286e+12p ps=7.22e+06u
-M1002 a_31_74# A_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=2.9792e+12p ps=1.407e+07u
-M1003 VGND B a_243_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.0528e+12p pd=6.36e+06u as=0p ps=0u
-M1005 VPWR A_N a_31_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_31_74# a_243_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_243_74# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_243_74# a_31_74# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B a_243_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A_N a_31_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1011 VPWR a_31_74# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_243_74# a_31_74# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y a_31_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_31_74# a_243_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 Y B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_243_74# a_31_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_31_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X4 VGND B a_243_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VPWR B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_31_74# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_243_74# a_31_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_243_74# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 Y a_31_74# a_243_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND B a_243_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VPWR a_31_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 VPWR A_N a_31_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X13 Y a_31_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_243_74# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nand3/sky130_fd_sc_ms__nand3_1.cdl b/cells/nand3/sky130_fd_sc_ms__nand3_1.cdl
index 875a224..1dcdec8 100644
--- a/cells/nand3/sky130_fd_sc_ms__nand3_1.cdl
+++ b/cells/nand3/sky130_fd_sc_ms__nand3_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__nand3_1 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=1 w=1.12 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 pshort m=1 w=1.12 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 pshort m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPB pfet_01v8 m=1 w=1.12 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_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nand3_1
diff --git a/cells/nand3/sky130_fd_sc_ms__nand3_1.netlist.tsv b/cells/nand3/sky130_fd_sc_ms__nand3_1.netlist.tsv
index 554a723..c7636fb 100644
--- a/cells/nand3/sky130_fd_sc_ms__nand3_1.netlist.tsv
+++ b/cells/nand3/sky130_fd_sc_ms__nand3_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__nand3_1	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3/sky130_fd_sc_ms__nand3_1.spice b/cells/nand3/sky130_fd_sc_ms__nand3_1.spice
index 7e8ad12..7bb61ab 100644
--- a/cells/nand3/sky130_fd_sc_ms__nand3_1.spice
+++ b/cells/nand3/sky130_fd_sc_ms__nand3_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ms__nand3_1 A B C VGND VNB VPB VPWR Y
-M1000 Y A a_233_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=3.108e+11p ps=2.32e+06u
-M1001 a_233_74# B a_155_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1002 a_155_74# C VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1003 Y C VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.16e+11p pd=5.58e+06u as=8.4e+11p ps=5.98e+06u
-M1004 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR C Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_155_74# B a_233_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VGND C a_155_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_233_74# A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 Y B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/nand3/sky130_fd_sc_ms__nand3_2.cdl b/cells/nand3/sky130_fd_sc_ms__nand3_2.cdl
index 8ba98a7..af57f60 100644
--- a/cells/nand3/sky130_fd_sc_ms__nand3_2.cdl
+++ b/cells/nand3/sky130_fd_sc_ms__nand3_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__nand3_2 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPB pfet_01v8 m=2 w=1.12 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_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nand3_2
diff --git a/cells/nand3/sky130_fd_sc_ms__nand3_2.netlist.tsv b/cells/nand3/sky130_fd_sc_ms__nand3_2.netlist.tsv
index 24e01d1..ea8b655 100644
--- a/cells/nand3/sky130_fd_sc_ms__nand3_2.netlist.tsv
+++ b/cells/nand3/sky130_fd_sc_ms__nand3_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__nand3_2	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3/sky130_fd_sc_ms__nand3_2.spice b/cells/nand3/sky130_fd_sc_ms__nand3_2.spice
index d12600b..5221f3e 100644
--- a/cells/nand3/sky130_fd_sc_ms__nand3_2.spice
+++ b/cells/nand3/sky130_fd_sc_ms__nand3_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__nand3_2 A B C VGND VNB VPB VPWR Y
-M1000 a_27_74# C VGND VNB nlowvt w=740000u l=150000u
-+  ad=6.068e+11p pd=6.08e+06u as=2.072e+11p ps=2.04e+06u
-M1001 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=1.3384e+12p pd=1.135e+07u as=9.128e+11p ps=8.35e+06u
-M1002 a_283_74# A Y VNB nlowvt w=740000u l=150000u
-+  ad=7.123e+11p pd=5.5e+06u as=2.072e+11p ps=2.04e+06u
-M1003 Y B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y C VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR C Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_283_74# B a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_74# B a_283_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND C a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A a_283_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 Y C VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VGND C a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_27_74# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_27_74# B a_283_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR C Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_283_74# B a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 Y B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_283_74# A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 Y A a_283_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nand3/sky130_fd_sc_ms__nand3_4.cdl b/cells/nand3/sky130_fd_sc_ms__nand3_4.cdl
index a3489be..b152f2d 100644
--- a/cells/nand3/sky130_fd_sc_ms__nand3_4.cdl
+++ b/cells/nand3/sky130_fd_sc_ms__nand3_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__nand3_4 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPB pfet_01v8 m=2 w=1.12 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_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nand3_4
diff --git a/cells/nand3/sky130_fd_sc_ms__nand3_4.netlist.tsv b/cells/nand3/sky130_fd_sc_ms__nand3_4.netlist.tsv
index e8df7a2..511cf54 100644
--- a/cells/nand3/sky130_fd_sc_ms__nand3_4.netlist.tsv
+++ b/cells/nand3/sky130_fd_sc_ms__nand3_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__nand3_4	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3/sky130_fd_sc_ms__nand3_4.spice b/cells/nand3/sky130_fd_sc_ms__nand3_4.spice
index bbb9948..aa29702 100644
--- a/cells/nand3/sky130_fd_sc_ms__nand3_4.spice
+++ b/cells/nand3/sky130_fd_sc_ms__nand3_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ms__nand3_4 A B C VGND VNB VPB VPWR Y
-M1000 a_456_82# C VGND VNB nlowvt w=740000u l=150000u
-+  ad=8.288e+11p pd=8.16e+06u as=6.142e+11p ps=6.1e+06u
-M1001 VGND C a_456_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_82# B a_456_82# VNB nlowvt w=740000u l=150000u
-+  ad=1.0121e+12p pd=1.018e+07u as=0p ps=0u
-M1003 a_456_82# B a_27_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.4896e+12p pd=9.38e+06u as=3.5896e+12p ps=1.537e+07u
-M1005 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A a_27_82# VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1008 VPWR B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND C a_456_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y C VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR C Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_82# B a_456_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_456_82# C VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_82# A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A a_27_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_456_82# B a_27_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_82# A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A a_27_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_27_82# A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 Y B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_27_82# A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_27_82# B a_456_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_456_82# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 Y C VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND C a_456_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_27_82# B a_456_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VGND C a_456_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 Y A a_27_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_456_82# B a_27_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_456_82# B a_27_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 VPWR B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_456_82# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 VPWR C Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/nand3b/sky130_fd_sc_ms__nand3b_1.cdl b/cells/nand3b/sky130_fd_sc_ms__nand3b_1.cdl
index 3c10df2..21715ab 100644
--- a/cells/nand3b/sky130_fd_sc_ms__nand3b_1.cdl
+++ b/cells/nand3b/sky130_fd_sc_ms__nand3b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__nand3b_1 A_N B C VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=1 w=1.12 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 pshort m=1 w=1.12 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 pshort m=1 w=1.12 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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nand3b_1
diff --git a/cells/nand3b/sky130_fd_sc_ms__nand3b_1.netlist.tsv b/cells/nand3b/sky130_fd_sc_ms__nand3b_1.netlist.tsv
index 51cc503..24d0881 100644
--- a/cells/nand3b/sky130_fd_sc_ms__nand3b_1.netlist.tsv
+++ b/cells/nand3b/sky130_fd_sc_ms__nand3b_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__nand3b_1	A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3b/sky130_fd_sc_ms__nand3b_1.spice b/cells/nand3b/sky130_fd_sc_ms__nand3b_1.spice
index fb0beb1..a381300 100644
--- a/cells/nand3b/sky130_fd_sc_ms__nand3b_1.spice
+++ b/cells/nand3b/sky130_fd_sc_ms__nand3b_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__nand3b_1 A_N B C VGND VNB VPB VPWR Y
-M1000 Y a_27_116# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.16e+11p pd=5.58e+06u as=8.47e+11p ps=6.03e+06u
-M1001 Y C VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y a_27_116# a_347_78# VNB nlowvt w=740000u l=150000u
-+  ad=3.404e+11p pd=2.4e+06u as=2.886e+11p ps=2.26e+06u
-M1003 VPWR B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A_N a_27_116# VNB nlowvt w=550000u l=150000u
-+  ad=4.4825e+11p pd=2.73e+06u as=1.5675e+11p ps=1.67e+06u
-M1005 VPWR A_N a_27_116# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1006 a_269_78# C VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1007 a_347_78# B a_269_78# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR C Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR a_27_116# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_27_116# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X4 a_269_78# B a_347_78# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VGND C a_269_78# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_347_78# a_27_116# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_27_116# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
 .ends
diff --git a/cells/nand3b/sky130_fd_sc_ms__nand3b_2.cdl b/cells/nand3b/sky130_fd_sc_ms__nand3b_2.cdl
index 5d2c4a5..70ac6f7 100644
--- a/cells/nand3b/sky130_fd_sc_ms__nand3b_2.cdl
+++ b/cells/nand3b/sky130_fd_sc_ms__nand3b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__nand3b_2 A_N B C VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=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_ms__nand3b_2
diff --git a/cells/nand3b/sky130_fd_sc_ms__nand3b_2.netlist.tsv b/cells/nand3b/sky130_fd_sc_ms__nand3b_2.netlist.tsv
index afddd5c..b90f28c 100644
--- a/cells/nand3b/sky130_fd_sc_ms__nand3b_2.netlist.tsv
+++ b/cells/nand3b/sky130_fd_sc_ms__nand3b_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__nand3b_2	A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	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_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3b/sky130_fd_sc_ms__nand3b_2.spice b/cells/nand3b/sky130_fd_sc_ms__nand3b_2.spice
index 7aa839d..276aff5 100644
--- a/cells/nand3b/sky130_fd_sc_ms__nand3b_2.spice
+++ b/cells/nand3b/sky130_fd_sc_ms__nand3b_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__nand3b_2 A_N B C VGND VNB VPB VPWR Y
-M1000 VPWR A_N a_27_94# VPB pshort w=1e+06u l=180000u
-+  ad=1.5646e+12p pd=1.177e+07u as=2.8e+11p ps=2.56e+06u
-M1001 a_206_74# C VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=4.2745e+11p ps=4.18e+06u
-M1002 VGND A_N a_27_94# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1003 VPWR C Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=1.0248e+12p ps=8.55e+06u
-M1004 Y a_27_94# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_27_94# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_27_94# a_403_54# VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=8.1145e+11p ps=7.38e+06u
-M1007 a_403_54# a_27_94# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND C a_206_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_206_74# B a_403_54# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_403_54# B a_206_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y C VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_27_94# a_403_54# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 Y B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_403_54# B a_206_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR C Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 Y a_27_94# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_206_74# B a_403_54# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VGND C a_206_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_27_94# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 Y C VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_27_94# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 a_206_74# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_403_54# a_27_94# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VPWR a_27_94# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/nand3b/sky130_fd_sc_ms__nand3b_4.cdl b/cells/nand3b/sky130_fd_sc_ms__nand3b_4.cdl
index 75638eb..2367117 100644
--- a/cells/nand3b/sky130_fd_sc_ms__nand3b_4.cdl
+++ b/cells/nand3b/sky130_fd_sc_ms__nand3b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__nand3b_4 A_N B C VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nand3b_4
diff --git a/cells/nand3b/sky130_fd_sc_ms__nand3b_4.netlist.tsv b/cells/nand3b/sky130_fd_sc_ms__nand3b_4.netlist.tsv
index 54b6dd5..8554ba3 100644
--- a/cells/nand3b/sky130_fd_sc_ms__nand3b_4.netlist.tsv
+++ b/cells/nand3b/sky130_fd_sc_ms__nand3b_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__nand3b_4	A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3b/sky130_fd_sc_ms__nand3b_4.spice b/cells/nand3b/sky130_fd_sc_ms__nand3b_4.spice
index f11d3f1..3982c39 100644
--- a/cells/nand3b/sky130_fd_sc_ms__nand3b_4.spice
+++ b/cells/nand3b/sky130_fd_sc_ms__nand3b_4.spice
@@ -16,46 +16,25 @@
 
 
 .subckt sky130_fd_sc_ms__nand3b_4 A_N B C VGND VNB VPB VPWR Y
-M1000 VGND A_N a_89_172# VNB nlowvt w=740000u l=150000u
-+  ad=1.1492e+12p pd=8.02e+06u as=1.9515e+11p ps=2.05e+06u
-M1001 VPWR C Y VPB pshort w=1.12e+06u l=180000u
-+  ad=4.8426e+12p pd=1.966e+07u as=1.3328e+12p ps=9.1e+06u
-M1002 Y B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_744_74# B a_297_82# VNB nlowvt w=740000u l=150000u
-+  ad=1.0672e+12p pd=1.036e+07u as=8.806e+11p ps=8.3e+06u
-M1004 VPWR B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_744_74# a_89_172# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.329e+11p ps=4.13e+06u
-M1006 a_297_82# C VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_744_74# B a_297_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_89_172# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_89_172# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND C a_297_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND C a_297_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_297_82# C VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y a_89_172# a_744_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y a_89_172# a_744_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_297_82# B a_744_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_297_82# B a_744_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_89_172# A_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1018 Y C VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_744_74# a_89_172# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A_N a_89_172# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 Y a_89_172# a_744_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_297_82# B a_744_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND C a_297_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_297_82# B a_744_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_744_74# a_89_172# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_297_82# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_89_172# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_744_74# a_89_172# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_89_172# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X10 a_297_82# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VPWR B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 Y a_89_172# a_744_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VPWR C Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 Y C VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 VPWR a_89_172# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VGND C a_297_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 Y a_89_172# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 a_744_74# B a_297_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 VPWR A_N a_89_172# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X20 a_744_74# B a_297_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nand4/sky130_fd_sc_ms__nand4_1.cdl b/cells/nand4/sky130_fd_sc_ms__nand4_1.cdl
index 5354243..5e9fed1 100644
--- a/cells/nand4/sky130_fd_sc_ms__nand4_1.cdl
+++ b/cells/nand4/sky130_fd_sc_ms__nand4_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__nand4_1 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=1 w=1.12 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 pshort m=1 w=1.12 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 pshort m=1 w=1.12 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 pshort m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPB pfet_01v8 m=1 w=1.12 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_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nand4_1
diff --git a/cells/nand4/sky130_fd_sc_ms__nand4_1.netlist.tsv b/cells/nand4/sky130_fd_sc_ms__nand4_1.netlist.tsv
index 6e066f3..0695980 100644
--- a/cells/nand4/sky130_fd_sc_ms__nand4_1.netlist.tsv
+++ b/cells/nand4/sky130_fd_sc_ms__nand4_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__nand4_1	A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4/sky130_fd_sc_ms__nand4_1.spice b/cells/nand4/sky130_fd_sc_ms__nand4_1.spice
index 0b2ea86..0c0635c 100644
--- a/cells/nand4/sky130_fd_sc_ms__nand4_1.spice
+++ b/cells/nand4/sky130_fd_sc_ms__nand4_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__nand4_1 A B C D VGND VNB VPB VPWR Y
-M1000 a_181_74# D VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=2.923e+11p ps=2.72e+06u
-M1001 Y D VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.608e+11p pd=5.66e+06u as=1.1648e+12p ps=8.8e+06u
-M1002 VPWR C Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_259_74# C a_181_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=0p ps=0u
-M1004 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_373_74# B a_259_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=0p ps=0u
-M1007 Y A a_373_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.085e+11p pd=2.05e+06u as=0p ps=0u
+X0 VGND D a_181_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_259_74# B a_373_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 Y C VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VPWR B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_373_74# A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_181_74# C a_259_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VPWR D Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/nand4/sky130_fd_sc_ms__nand4_2.cdl b/cells/nand4/sky130_fd_sc_ms__nand4_2.cdl
index dae4c39..73c0ad1 100644
--- a/cells/nand4/sky130_fd_sc_ms__nand4_2.cdl
+++ b/cells/nand4/sky130_fd_sc_ms__nand4_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__nand4_2 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPB pfet_01v8 m=2 w=1.12 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_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nand4_2
diff --git a/cells/nand4/sky130_fd_sc_ms__nand4_2.netlist.tsv b/cells/nand4/sky130_fd_sc_ms__nand4_2.netlist.tsv
index 56e2d93..e5f346c 100644
--- a/cells/nand4/sky130_fd_sc_ms__nand4_2.netlist.tsv
+++ b/cells/nand4/sky130_fd_sc_ms__nand4_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__nand4_2	A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4/sky130_fd_sc_ms__nand4_2.spice b/cells/nand4/sky130_fd_sc_ms__nand4_2.spice
index 87973bf..d249e91 100644
--- a/cells/nand4/sky130_fd_sc_ms__nand4_2.spice
+++ b/cells/nand4/sky130_fd_sc_ms__nand4_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ms__nand4_2 A B C D VGND VNB VPB VPWR Y
-M1000 VPWR C Y VPB pshort w=1.12e+06u l=180000u
-+  ad=2.1336e+12p pd=1.501e+07u as=1.2768e+12p ps=1.124e+07u
-M1001 a_515_74# A Y VNB nlowvt w=740000u l=150000u
-+  ad=6.2875e+11p pd=6.24e+06u as=2.22e+11p ps=2.08e+06u
-M1002 Y D VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_74# D VGND VNB nlowvt w=740000u l=150000u
-+  ad=6.5035e+11p pd=6.28e+06u as=2.738e+11p ps=2.22e+06u
-M1004 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR D Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_515_74# B a_304_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1008 a_304_74# C a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A a_515_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND D a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y C VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_74# C a_304_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_304_74# B a_515_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y D VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_515_74# B a_304_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_515_74# A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND D a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 Y B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VPWR D Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y C VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_27_74# C a_304_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR C Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_304_74# C a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VPWR B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_27_74# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 Y A a_515_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_304_74# B a_515_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nand4/sky130_fd_sc_ms__nand4_4.cdl b/cells/nand4/sky130_fd_sc_ms__nand4_4.cdl
index 7d30402..055d8c0 100644
--- a/cells/nand4/sky130_fd_sc_ms__nand4_4.cdl
+++ b/cells/nand4/sky130_fd_sc_ms__nand4_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__nand4_4 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPB pfet_01v8 m=2 w=1.12 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_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nand4_4
diff --git a/cells/nand4/sky130_fd_sc_ms__nand4_4.netlist.tsv b/cells/nand4/sky130_fd_sc_ms__nand4_4.netlist.tsv
index 981cff8..d7fe99d 100644
--- a/cells/nand4/sky130_fd_sc_ms__nand4_4.netlist.tsv
+++ b/cells/nand4/sky130_fd_sc_ms__nand4_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__nand4_4	A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4/sky130_fd_sc_ms__nand4_4.spice b/cells/nand4/sky130_fd_sc_ms__nand4_4.spice
index 162398b..cab9609 100644
--- a/cells/nand4/sky130_fd_sc_ms__nand4_4.spice
+++ b/cells/nand4/sky130_fd_sc_ms__nand4_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__nand4_4 A B C D VGND VNB VPB VPWR Y
-M1000 VPWR B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=5.1016e+12p pd=2.031e+07u as=2.6544e+12p ps=1.37e+07u
-M1001 a_554_74# C a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=8.288e+11p pd=8.16e+06u as=1.13125e+12p ps=1.05e+07u
-M1002 Y A a_923_74# VNB nlowvt w=740000u l=150000u
-+  ad=5.328e+11p pd=4.4e+06u as=1.0147e+12p ps=1.022e+07u
-M1003 a_923_74# B a_554_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_923_74# B a_554_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR D Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND D a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=6.66e+11p pd=4.76e+06u as=0p ps=0u
-M1007 Y D VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_74# D VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y C VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# C a_554_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_554_74# C a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_923_74# A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_74# D VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A a_923_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_554_74# B a_923_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR C Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND D a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_74# C a_554_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_554_74# B a_923_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_923_74# A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_923_74# B a_554_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_923_74# A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 Y C VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 Y A a_923_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_27_74# C a_554_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 Y A a_923_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_923_74# B a_554_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR C Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 Y B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_27_74# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_27_74# C a_554_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_554_74# C a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VPWR D Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_554_74# B a_923_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 VGND D a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 VGND D a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_554_74# C a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 VPWR B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_554_74# B a_923_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 Y D VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_27_74# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_923_74# A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nand4b/sky130_fd_sc_ms__nand4b_1.cdl b/cells/nand4b/sky130_fd_sc_ms__nand4b_1.cdl
index 9801d8d..43e9891 100644
--- a/cells/nand4b/sky130_fd_sc_ms__nand4b_1.cdl
+++ b/cells/nand4b/sky130_fd_sc_ms__nand4b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__nand4b_1 A_N B C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=1 w=1.12 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 pshort m=1 w=1.12 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 pshort m=1 w=1.12 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 pshort m=1 w=1.12 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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nand4b_1
diff --git a/cells/nand4b/sky130_fd_sc_ms__nand4b_1.netlist.tsv b/cells/nand4b/sky130_fd_sc_ms__nand4b_1.netlist.tsv
index c03e5f6..86943f8 100644
--- a/cells/nand4b/sky130_fd_sc_ms__nand4b_1.netlist.tsv
+++ b/cells/nand4b/sky130_fd_sc_ms__nand4b_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__nand4b_1	A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4b/sky130_fd_sc_ms__nand4b_1.spice b/cells/nand4b/sky130_fd_sc_ms__nand4b_1.spice
index f01f9e9..9f1a47a 100644
--- a/cells/nand4b/sky130_fd_sc_ms__nand4b_1.spice
+++ b/cells/nand4b/sky130_fd_sc_ms__nand4b_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__nand4b_1 A_N B C D VGND VNB VPB VPWR Y
-M1000 Y B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=1.239e+12p ps=8.97e+06u
-M1001 VPWR a_27_112# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_443_74# B a_341_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=2.664e+11p ps=2.2e+06u
-M1003 Y a_27_112# a_443_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.404e+11p pd=2.4e+06u as=0p ps=0u
-M1004 VPWR A_N a_27_112# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1005 Y D VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A_N a_27_112# VNB nlowvt w=550000u l=150000u
-+  ad=2.696e+11p pd=2.26e+06u as=2.695e+11p ps=2.08e+06u
-M1007 VPWR C Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_263_74# D VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1009 a_341_74# C a_263_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_27_112# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_27_112# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X2 VPWR D Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_263_74# C a_341_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VGND D a_263_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VPWR B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_27_112# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 Y C VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_341_74# B a_443_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_443_74# a_27_112# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nand4b/sky130_fd_sc_ms__nand4b_2.cdl b/cells/nand4b/sky130_fd_sc_ms__nand4b_2.cdl
index 67d1697..25e893b 100644
--- a/cells/nand4b/sky130_fd_sc_ms__nand4b_2.cdl
+++ b/cells/nand4b/sky130_fd_sc_ms__nand4b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__nand4b_2 A_N B C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=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_ms__nand4b_2
diff --git a/cells/nand4b/sky130_fd_sc_ms__nand4b_2.netlist.tsv b/cells/nand4b/sky130_fd_sc_ms__nand4b_2.netlist.tsv
index 7dec576..04d9e92 100644
--- a/cells/nand4b/sky130_fd_sc_ms__nand4b_2.netlist.tsv
+++ b/cells/nand4b/sky130_fd_sc_ms__nand4b_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__nand4b_2	A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	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_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4b/sky130_fd_sc_ms__nand4b_2.spice b/cells/nand4b/sky130_fd_sc_ms__nand4b_2.spice
index 7a4e3cc..a826d13 100644
--- a/cells/nand4b/sky130_fd_sc_ms__nand4b_2.spice
+++ b/cells/nand4b/sky130_fd_sc_ms__nand4b_2.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ms__nand4b_2 A_N B C D VGND VNB VPB VPWR Y
-M1000 a_719_123# C a_490_74# VNB nlowvt w=740000u l=150000u
-+  ad=6.22175e+11p pd=6.14e+06u as=5.618e+11p ps=4.6e+06u
-M1001 a_225_74# B a_490_74# VNB nlowvt w=740000u l=150000u
-+  ad=6.01175e+11p pd=6.14e+06u as=0p ps=0u
-M1002 a_225_74# a_27_74# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.294e+11p ps=2.1e+06u
-M1003 a_719_123# D VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=3.946e+11p ps=3.93e+06u
-M1004 Y D VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2096e+12p pd=1.112e+07u as=2.3654e+12p ps=1.544e+07u
-M1005 VGND D a_719_123# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_490_74# C a_719_123# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_490_74# B a_225_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A_N a_27_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1009 Y C VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A_N a_27_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1011 Y a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR D Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR C Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y a_27_74# a_225_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_27_74# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_490_74# C a_719_123# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VGND D a_719_123# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VPWR D Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Y a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 Y D VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VPWR C Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 Y a_27_74# a_225_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_490_74# B a_225_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 Y B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_225_74# B a_490_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VPWR a_27_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_719_123# C a_490_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 Y C VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_225_74# a_27_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VPWR B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_27_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 a_719_123# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_27_74# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/nand4b/sky130_fd_sc_ms__nand4b_4.cdl b/cells/nand4b/sky130_fd_sc_ms__nand4b_4.cdl
index 71e49a3..b991d5a 100644
--- a/cells/nand4b/sky130_fd_sc_ms__nand4b_4.cdl
+++ b/cells/nand4b/sky130_fd_sc_ms__nand4b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__nand4b_4 A_N B C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nand4b_4
diff --git a/cells/nand4b/sky130_fd_sc_ms__nand4b_4.netlist.tsv b/cells/nand4b/sky130_fd_sc_ms__nand4b_4.netlist.tsv
index 8e2e7ae..15e360f 100644
--- a/cells/nand4b/sky130_fd_sc_ms__nand4b_4.netlist.tsv
+++ b/cells/nand4b/sky130_fd_sc_ms__nand4b_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__nand4b_4	A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4b/sky130_fd_sc_ms__nand4b_4.spice b/cells/nand4b/sky130_fd_sc_ms__nand4b_4.spice
index 4496caa..72e3141 100644
--- a/cells/nand4b/sky130_fd_sc_ms__nand4b_4.spice
+++ b/cells/nand4b/sky130_fd_sc_ms__nand4b_4.spice
@@ -16,58 +16,31 @@
 
 
 .subckt sky130_fd_sc_ms__nand4b_4 A_N B C D VGND VNB VPB VPWR Y
-M1000 a_656_74# C a_1025_158# VNB nlowvt w=740000u l=150000u
-+  ad=8.399e+11p pd=8.19e+06u as=1.0287e+12p ps=1.022e+07u
-M1001 VGND D a_1025_158# VNB nlowvt w=740000u l=150000u
-+  ad=6.9465e+11p pd=6.36e+06u as=0p ps=0u
-M1002 Y a_27_158# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.1168e+12p pd=1.274e+07u as=4.9266e+12p ps=2.188e+07u
-M1003 a_225_74# B a_656_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.01295e+12p pd=1.022e+07u as=0p ps=0u
-M1004 VPWR a_27_158# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_225_74# a_27_158# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1006 Y D VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_1025_158# D VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1025_158# C a_656_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_656_74# B a_225_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR D Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_225_74# a_27_158# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR C Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1025_158# C a_656_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1025_158# D VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND D a_1025_158# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y C VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_158# A_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1019 a_225_74# B a_656_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_656_74# B a_225_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A_N a_27_158# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A_N a_27_158# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.962e+11p ps=2.05e+06u
-M1024 Y a_27_158# a_225_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y a_27_158# a_225_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_656_74# C a_1025_158# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_27_158# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_225_74# B a_656_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_27_158# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 VPWR B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 Y a_27_158# a_225_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_656_74# B a_225_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR C Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_656_74# C a_1025_158# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_1025_158# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_656_74# B a_225_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_656_74# C a_1025_158# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_1025_158# C a_656_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_1025_158# C a_656_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VGND D a_1025_158# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VPWR A_N a_27_158# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X15 VPWR D Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 Y a_27_158# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 Y a_27_158# a_225_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 VGND D a_1025_158# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 Y B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_1025_158# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 a_225_74# a_27_158# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 Y C VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 Y D VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_27_158# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 a_225_74# a_27_158# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 a_225_74# B a_656_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.cdl b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.cdl
index 0680b9f..d4a64fa 100644
--- a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.cdl
+++ b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__nand4bb_1 A_N B_N C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=1 w=1.12 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 pshort m=1 w=1.12 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 pshort m=1 w=1.12 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 pshort m=1 w=1.12 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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 B B_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nand4bb_1
diff --git a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.netlist.tsv b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.netlist.tsv
index 0657519..701f689 100644
--- a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.netlist.tsv
+++ b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__nand4bb_1	A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.spice b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.spice
index afdb530..b1c2026 100644
--- a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.spice
+++ b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__nand4bb_1 A_N B_N C D VGND VNB VPB VPWR Y
-M1000 a_229_398# B_N VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.5055e+11p pd=1.69e+06u as=5.10375e+11p ps=4.39e+06u
-M1001 a_513_74# a_229_398# a_435_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=1.776e+11p ps=1.96e+06u
-M1002 VGND A_N a_27_398# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.50975e+11p ps=1.67e+06u
-M1003 VGND D a_627_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=3.108e+11p ps=2.32e+06u
-M1004 VPWR a_27_398# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=1.1844e+12p pd=8.46e+06u as=9.856e+11p ps=8.48e+06u
-M1005 Y D VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_229_398# B_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1007 VPWR C Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y a_229_398# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_435_74# a_27_398# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.9585e+11p ps=2.05e+06u
-M1010 VPWR A_N a_27_398# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1011 a_627_74# C a_513_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_229_398# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR D Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y C VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_435_74# a_229_398# a_513_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_627_74# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VGND B_N a_229_398# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X6 a_513_74# C a_627_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 Y a_27_398# a_435_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 Y a_27_398# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_27_398# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X10 VPWR B_N a_229_398# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X11 a_27_398# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
 .ends
diff --git a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.cdl b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.cdl
index 3f3f12a..01455c1 100644
--- a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.cdl
+++ b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__nand4bb_2 A_N B_N C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=2 w=1.12 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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=2 w=1.12 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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 B B_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8_lvt m=1 w=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_ms__nand4bb_2
diff --git a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.netlist.tsv b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.netlist.tsv
index 9a0aa2c..49c1c21 100644
--- a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.netlist.tsv
+++ b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__nand4bb_2	A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8	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_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.spice b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.spice
index 52e307c..5e79583 100644
--- a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.spice
+++ b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__nand4bb_2 A_N B_N C D VGND VNB VPB VPWR Y
-M1000 Y a_231_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2544e+12p pd=1.12e+07u as=2.8737e+12p ps=1.85e+07u
-M1001 Y C VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_373_74# a_231_74# a_678_74# VNB nlowvt w=740000u l=150000u
-+  ad=8.504e+11p pd=6.86e+06u as=4.662e+11p ps=4.22e+06u
-M1003 Y a_27_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR a_231_74# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_231_74# B_N VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=5.278e+11p ps=4.3e+06u
-M1006 a_886_74# D VGND VNB nlowvt w=740000u l=150000u
-+  ad=6.29e+11p pd=6.14e+06u as=0p ps=0u
-M1007 VPWR a_27_368# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y D VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND D a_886_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A_N a_27_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1011 VPWR C Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_373_74# a_27_368# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.257e+11p ps=2.09e+06u
-M1013 a_886_74# C a_678_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR D Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_678_74# a_231_74# a_373_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y a_27_368# a_373_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_231_74# B_N VPWR VPB pshort w=1e+06u l=180000u
-+  ad=3.8e+11p pd=2.76e+06u as=0p ps=0u
-M1018 VGND A_N a_27_368# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1019 a_678_74# C a_886_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_27_368# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_678_74# C a_886_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VPWR C Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VPWR D Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 Y a_27_368# a_373_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_678_74# a_231_74# a_373_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_373_74# a_27_368# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 Y C VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VPWR a_231_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 Y a_27_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 VGND B_N a_231_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 a_27_368# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 a_27_368# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 Y D VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VGND D a_886_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_886_74# C a_678_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_373_74# a_231_74# a_678_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 VPWR B_N a_231_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 a_886_74# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 Y a_231_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.cdl b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.cdl
index a28c586..ebf2985 100644
--- a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.cdl
+++ b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__nand4bb_4 A_N B_N C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pshort m=4 w=1.12 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 pshort m=4 w=1.12 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 pshort m=4 w=1.12 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 pshort m=4 w=1.12 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 pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8 m=4 w=1.12 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 pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 B B_N VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nand4bb_4
diff --git a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.netlist.tsv b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.netlist.tsv
index 745afd7..199c5d3 100644
--- a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.netlist.tsv
+++ b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__nand4bb_4	A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.spice b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.spice
index c47ed54..3d5531e 100644
--- a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.spice
+++ b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_ms__nand4bb_4 A_N B_N C D VGND VNB VPB VPWR Y
-M1000 VPWR a_27_114# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=3.64e+12p pd=3.044e+07u as=2.4752e+12p ps=2.234e+07u
-M1001 a_374_74# a_27_114# Y VNB nlowvt w=740000u l=150000u
-+  ad=1.0508e+12p pd=1.024e+07u as=4.921e+11p ps=4.29e+06u
-M1002 Y a_27_114# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y a_27_114# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_828_74# a_232_114# a_374_74# VNB nlowvt w=740000u l=150000u
-+  ad=9.53e+11p pd=8.52e+06u as=0p ps=0u
-M1005 a_1229_74# D VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.0434e+12p pd=1.022e+07u as=9.049e+11p ps=7.36e+06u
-M1006 VPWR a_27_114# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_374_74# a_27_114# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_374_74# a_232_114# a_828_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND D a_1229_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y a_232_114# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y a_27_114# a_374_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND D a_1229_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_232_114# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_828_74# a_232_114# a_374_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_114# A_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1016 VPWR A_N a_27_114# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y a_232_114# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A_N a_27_114# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1019 a_232_114# B_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1020 VPWR a_232_114# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y C VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_232_114# B_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.368e+11p pd=2.12e+06u as=0p ps=0u
-M1023 a_828_74# C a_1229_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR B_N a_232_114# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_828_74# C a_1229_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y C VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR C Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y D VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR C Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR D Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y D VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_374_74# a_232_114# a_828_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y a_27_114# a_374_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1229_74# D VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1229_74# C a_828_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR D Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1229_74# C a_828_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_114# A_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 a_1229_74# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VPWR C Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_232_114# B_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X4 Y a_232_114# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 Y a_27_114# a_374_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_374_74# a_27_114# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR a_27_114# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 Y C VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_1229_74# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_828_74# a_232_114# a_374_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_27_114# A_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_374_74# a_27_114# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VPWR a_232_114# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VGND B_N a_232_114# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 Y a_27_114# a_374_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 Y D VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VPWR A_N a_27_114# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X18 a_1229_74# C a_828_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_374_74# a_232_114# a_828_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 VPWR a_27_114# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 VPWR B_N a_232_114# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X22 a_1229_74# C a_828_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 VPWR a_232_114# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 Y C VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 a_828_74# a_232_114# a_374_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 Y a_27_114# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 VPWR C Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 a_828_74# C a_1229_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 Y a_27_114# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X30 Y a_232_114# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X31 VPWR D Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 a_828_74# C a_1229_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 VPWR D Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X34 VGND D a_1229_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X35 VGND D a_1229_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X36 Y D VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X37 a_374_74# a_232_114# a_828_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_1.cdl b/cells/nor2/sky130_fd_sc_ms__nor2_1.cdl
index a0dd31c..48fe74e 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_1.cdl
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ms__nor2_1 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 Y B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nor2_1
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_1.netlist.tsv b/cells/nor2/sky130_fd_sc_ms__nor2_1.netlist.tsv
index 7c8a2ac..e3da3d6 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_1.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ms__nor2_1	A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_1.spice b/cells/nor2/sky130_fd_sc_ms__nor2_1.spice
index 418c3f0..fc82cff 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_1.spice
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_ms__nor2_1 A B VGND VNB VPB VPWR Y
-M1000 a_119_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.688e+11p pd=2.72e+06u as=3.136e+11p ps=2.8e+06u
-M1001 Y B a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1002 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=4.218e+11p pd=4.1e+06u as=2.072e+11p ps=2.04e+06u
-M1003 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VPWR A a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_119_368# B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_2.cdl b/cells/nor2/sky130_fd_sc_ms__nor2_2.cdl
index e582021..8cdb143 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_2.cdl
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ms__nor2_2 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 Y B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nor2_2
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_2.netlist.tsv b/cells/nor2/sky130_fd_sc_ms__nor2_2.netlist.tsv
index f8f721c..8e51402 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_2.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ms__nor2_2	A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_2.spice b/cells/nor2/sky130_fd_sc_ms__nor2_2.spice
index cecb52e..7f0deeb 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_2.spice
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_2.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ms__nor2_2 A B VGND VNB VPB VPWR Y
-M1000 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=5.254e+11p pd=4.38e+06u as=2.072e+11p ps=2.04e+06u
-M1001 Y B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y B a_35_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=9.296e+11p ps=8.38e+06u
-M1003 a_35_368# B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A a_35_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1005 a_35_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B a_35_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR A a_35_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VGND B Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_35_368# B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_35_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_4.cdl b/cells/nor2/sky130_fd_sc_ms__nor2_4.cdl
index f9257c2..bf53e34 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_4.cdl
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ms__nor2_4 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 Y B VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nor2_4
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_4.netlist.tsv b/cells/nor2/sky130_fd_sc_ms__nor2_4.netlist.tsv
index 08861d7..0a5d8b4 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_4.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ms__nor2_4	A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_4.spice b/cells/nor2/sky130_fd_sc_ms__nor2_4.spice
index 6ab927f..789007e 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_4.spice
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_4.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__nor2_4 A B VGND VNB VPB VPWR Y
-M1000 VPWR A a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=1.6576e+12p ps=1.416e+07u
-M1001 a_27_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=1.4874e+12p pd=8.46e+06u as=1.0656e+12p ps=5.84e+06u
-M1003 VPWR A a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.608e+11p pd=5.66e+06u as=0p ps=0u
-M1008 a_27_368# B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_368# B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VPWR A a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VPWR A a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 Y B a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_27_368# B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 Y B a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_27_368# B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_8.cdl b/cells/nor2/sky130_fd_sc_ms__nor2_8.cdl
index 3f254fb..32fb30d 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_8.cdl
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ms__nor2_8 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=8 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=8 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=8 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=8 w=1.12 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 nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 Y B VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nor2_8
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_8.netlist.tsv b/cells/nor2/sky130_fd_sc_ms__nor2_8.netlist.tsv
index d0d119d..b21651b 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_8.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ms__nor2_8	A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	pshort	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8	8	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_8.spice b/cells/nor2/sky130_fd_sc_ms__nor2_8.spice
index 9293043..9c30359 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_8.spice
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_8.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__nor2_8 A B VGND VNB VPB VPWR Y
-M1000 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=2.1756e+12p pd=1.328e+07u as=1.4393e+12p ps=9.81e+06u
-M1001 a_27_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+12p pd=2.536e+07u as=1.4336e+12p ps=1.152e+07u
-M1002 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2656e+12p pd=1.122e+07u as=0p ps=0u
-M1013 a_27_368# B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y B a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_368# B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y B a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_368# B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_368# B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VPWR A a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Y B a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 Y B a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_27_368# B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VGND B Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_27_368# B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_27_368# B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 VPWR A a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_27_368# B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 VGND B Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 VPWR A a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 Y B a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 VPWR A a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nor2b/sky130_fd_sc_ms__nor2b_1.cdl b/cells/nor2b/sky130_fd_sc_ms__nor2b_1.cdl
index fbf08a6..4ba7349 100644
--- a/cells/nor2b/sky130_fd_sc_ms__nor2b_1.cdl
+++ b/cells/nor2b/sky130_fd_sc_ms__nor2b_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__nor2b_1 A B_N VGND VNB VPB VPWR Y
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 B B_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 Y B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nor2b_1
diff --git a/cells/nor2b/sky130_fd_sc_ms__nor2b_1.netlist.tsv b/cells/nor2b/sky130_fd_sc_ms__nor2b_1.netlist.tsv
index 2daadd1..c8d9eb5 100644
--- a/cells/nor2b/sky130_fd_sc_ms__nor2b_1.netlist.tsv
+++ b/cells/nor2b/sky130_fd_sc_ms__nor2b_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__nor2b_1	A:I B_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2b/sky130_fd_sc_ms__nor2b_1.spice b/cells/nor2b/sky130_fd_sc_ms__nor2b_1.spice
index 5f74b3b..0bb1d30 100644
--- a/cells/nor2b/sky130_fd_sc_ms__nor2b_1.spice
+++ b/cells/nor2b/sky130_fd_sc_ms__nor2b_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ms__nor2b_1 A B_N VGND VNB VPB VPWR Y
-M1000 a_281_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.688e+11p pd=2.72e+06u as=4.396e+11p ps=3.1e+06u
-M1001 Y a_27_112# a_281_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=4.032e+11p pd=2.96e+06u as=0p ps=0u
-M1002 VGND a_27_112# Y VNB nlowvt w=740000u l=150000u
-+  ad=5.6985e+11p pd=4.59e+06u as=2.627e+11p ps=2.19e+06u
-M1003 VPWR B_N a_27_112# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1004 VGND B_N a_27_112# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=2.805e+11p ps=2.12e+06u
-M1005 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_281_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_281_368# a_27_112# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_27_112# B_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X3 Y a_27_112# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_27_112# B_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
 .ends
diff --git a/cells/nor2b/sky130_fd_sc_ms__nor2b_2.cdl b/cells/nor2b/sky130_fd_sc_ms__nor2b_2.cdl
index 6303091..2e872f5 100644
--- a/cells/nor2b/sky130_fd_sc_ms__nor2b_2.cdl
+++ b/cells/nor2b/sky130_fd_sc_ms__nor2b_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__nor2b_2 A B_N VGND VNB VPB VPWR Y
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=2 w=1.12 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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 B B_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 Y B VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8_lvt m=1 w=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_ms__nor2b_2
diff --git a/cells/nor2b/sky130_fd_sc_ms__nor2b_2.netlist.tsv b/cells/nor2b/sky130_fd_sc_ms__nor2b_2.netlist.tsv
index 6c4993b..376ecae 100644
--- a/cells/nor2b/sky130_fd_sc_ms__nor2b_2.netlist.tsv
+++ b/cells/nor2b/sky130_fd_sc_ms__nor2b_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__nor2b_2	A:I B_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2b/sky130_fd_sc_ms__nor2b_2.spice b/cells/nor2b/sky130_fd_sc_ms__nor2b_2.spice
index 070b0b1..b54603d 100644
--- a/cells/nor2b/sky130_fd_sc_ms__nor2b_2.spice
+++ b/cells/nor2b/sky130_fd_sc_ms__nor2b_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__nor2b_2 A B_N VGND VNB VPB VPWR Y
-M1000 a_228_368# a_27_392# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=9.24e+11p pd=8.37e+06u as=3.024e+11p ps=2.78e+06u
-M1001 VPWR A a_228_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=5.824e+11p pd=5.34e+06u as=0p ps=0u
-M1002 a_228_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y a_27_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.884e+11p pd=4.28e+06u as=7.744e+11p ps=6.56e+06u
-M1004 VPWR B_N a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.55e+06u
-M1005 VGND B_N a_27_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1006 VGND a_27_392# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_27_392# a_228_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_392# B_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_27_392# B_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 Y a_27_392# a_228_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR A a_228_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 Y a_27_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VGND a_27_392# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_228_368# a_27_392# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_228_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/nor2b/sky130_fd_sc_ms__nor2b_4.cdl b/cells/nor2b/sky130_fd_sc_ms__nor2b_4.cdl
index ebdc637..9ffd018 100644
--- a/cells/nor2b/sky130_fd_sc_ms__nor2b_4.cdl
+++ b/cells/nor2b/sky130_fd_sc_ms__nor2b_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__nor2b_4 A B_N VGND VNB VPB VPWR Y
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=4 w=1.12 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 pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 B B_N VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 Y B VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nor2b_4
diff --git a/cells/nor2b/sky130_fd_sc_ms__nor2b_4.netlist.tsv b/cells/nor2b/sky130_fd_sc_ms__nor2b_4.netlist.tsv
index e8337b2..b4b0d4d 100644
--- a/cells/nor2b/sky130_fd_sc_ms__nor2b_4.netlist.tsv
+++ b/cells/nor2b/sky130_fd_sc_ms__nor2b_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__nor2b_4	A:I B_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2b/sky130_fd_sc_ms__nor2b_4.spice b/cells/nor2b/sky130_fd_sc_ms__nor2b_4.spice
index 4ccc2cc..f9295b6 100644
--- a/cells/nor2b/sky130_fd_sc_ms__nor2b_4.spice
+++ b/cells/nor2b/sky130_fd_sc_ms__nor2b_4.spice
@@ -16,34 +16,19 @@
 
 
 .subckt sky130_fd_sc_ms__nor2b_4 A B_N VGND VNB VPB VPWR Y
-M1000 a_353_323# B_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=1.2838e+12p ps=1.087e+07u
-M1001 a_353_323# B_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=5.18e+11p pd=2.88e+06u as=1.3489e+12p ps=8.29e+06u
-M1002 VPWR B_N a_353_323# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1004 a_119_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2656e+12p pd=1.122e+07u as=0p ps=0u
-M1005 VPWR A a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_353_323# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_119_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_353_323# a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1010 a_119_368# a_353_323# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y a_353_323# a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_119_368# a_353_323# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_353_323# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B_N a_353_323# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 a_119_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y a_353_323# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_119_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_119_368# a_353_323# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_119_368# a_353_323# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND B_N a_353_323# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR A a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_353_323# B_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X11 VPWR A a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 Y a_353_323# a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 Y a_353_323# a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VGND a_353_323# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nor3/sky130_fd_sc_ms__nor3_1.cdl b/cells/nor3/sky130_fd_sc_ms__nor3_1.cdl
index 133ec59..a88647a 100644
--- a/cells/nor3/sky130_fd_sc_ms__nor3_1.cdl
+++ b/cells/nor3/sky130_fd_sc_ms__nor3_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__nor3_1 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 Y B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 Y C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nor3_1
diff --git a/cells/nor3/sky130_fd_sc_ms__nor3_1.netlist.tsv b/cells/nor3/sky130_fd_sc_ms__nor3_1.netlist.tsv
index c4e6908..df4a746 100644
--- a/cells/nor3/sky130_fd_sc_ms__nor3_1.netlist.tsv
+++ b/cells/nor3/sky130_fd_sc_ms__nor3_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__nor3_1	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3/sky130_fd_sc_ms__nor3_1.spice b/cells/nor3/sky130_fd_sc_ms__nor3_1.spice
index 424cabd..bf68dec 100644
--- a/cells/nor3/sky130_fd_sc_ms__nor3_1.spice
+++ b/cells/nor3/sky130_fd_sc_ms__nor3_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ms__nor3_1 A B C VGND VNB VPB VPWR Y
-M1000 Y C a_201_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=3.696e+11p ps=2.9e+06u
-M1001 a_117_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.688e+11p pd=2.72e+06u as=3.024e+11p ps=2.78e+06u
-M1002 Y C VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.181e+11p pd=4.09e+06u as=4.699e+11p ps=4.23e+06u
-M1003 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_201_368# B a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND C Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_117_368# B a_201_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR A a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_201_368# C Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/nor3/sky130_fd_sc_ms__nor3_2.cdl b/cells/nor3/sky130_fd_sc_ms__nor3_2.cdl
index 719fc7f..a777e35 100644
--- a/cells/nor3/sky130_fd_sc_ms__nor3_2.cdl
+++ b/cells/nor3/sky130_fd_sc_ms__nor3_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__nor3_2 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 Y B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 Y C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nor3_2
diff --git a/cells/nor3/sky130_fd_sc_ms__nor3_2.netlist.tsv b/cells/nor3/sky130_fd_sc_ms__nor3_2.netlist.tsv
index 4adff24..3072c57 100644
--- a/cells/nor3/sky130_fd_sc_ms__nor3_2.netlist.tsv
+++ b/cells/nor3/sky130_fd_sc_ms__nor3_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__nor3_2	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3/sky130_fd_sc_ms__nor3_2.spice b/cells/nor3/sky130_fd_sc_ms__nor3_2.spice
index bfdcf1c..bd75391 100644
--- a/cells/nor3/sky130_fd_sc_ms__nor3_2.spice
+++ b/cells/nor3/sky130_fd_sc_ms__nor3_2.spice
@@ -16,22 +16,13 @@
 
 
 .subckt sky130_fd_sc_ms__nor3_2 A B C VGND VNB VPB VPWR Y
-M1000 a_27_368# C Y VPB pshort w=1.12e+06u l=180000u
-+  ad=9.296e+11p pd=8.38e+06u as=3.584e+11p ps=2.88e+06u
-M1001 a_309_368# B a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.384e+11p pd=5.62e+06u as=0p ps=0u
-M1002 Y C a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_309_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.248e+11p ps=2.82e+06u
-M1004 a_27_368# B a_309_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A a_309_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C Y VNB nlowvt w=740000u l=150000u
-+  ad=9.176e+11p pd=5.44e+06u as=4.699e+11p ps=4.23e+06u
-M1007 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_309_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_27_368# B a_309_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_27_368# C Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_309_368# B a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_309_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 Y C a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VGND B Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nor3/sky130_fd_sc_ms__nor3_4.cdl b/cells/nor3/sky130_fd_sc_ms__nor3_4.cdl
index b37b224..29944a5 100644
--- a/cells/nor3/sky130_fd_sc_ms__nor3_4.cdl
+++ b/cells/nor3/sky130_fd_sc_ms__nor3_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__nor3_4 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 Y B VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 Y C VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nor3_4
diff --git a/cells/nor3/sky130_fd_sc_ms__nor3_4.netlist.tsv b/cells/nor3/sky130_fd_sc_ms__nor3_4.netlist.tsv
index 7ea765b..5d6733d 100644
--- a/cells/nor3/sky130_fd_sc_ms__nor3_4.netlist.tsv
+++ b/cells/nor3/sky130_fd_sc_ms__nor3_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__nor3_4	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3/sky130_fd_sc_ms__nor3_4.spice b/cells/nor3/sky130_fd_sc_ms__nor3_4.spice
index f7005d4..0e4f3b1 100644
--- a/cells/nor3/sky130_fd_sc_ms__nor3_4.spice
+++ b/cells/nor3/sky130_fd_sc_ms__nor3_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ms__nor3_4 A B C VGND VNB VPB VPWR Y
-M1000 Y C a_298_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=9.786e+11p pd=6.44e+06u as=1.8418e+12p ps=1.279e+07u
-M1001 Y C a_298_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y C VGND VNB nlowvt w=740000u l=150000u
-+  ad=6.29e+11p pd=6.14e+06u as=1.22935e+12p ps=9.25e+06u
-M1003 a_27_368# B a_298_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.5176e+12p pd=1.391e+07u as=0p ps=0u
-M1004 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_298_368# B a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND C Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=6.048e+11p ps=5.56e+06u
-M1009 VPWR A a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_368# B a_298_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_298_368# B a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_298_368# C Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_298_368# C Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y C a_298_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VGND C Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_298_368# B a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_298_368# C Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 Y C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 Y C a_298_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VPWR A a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_298_368# C Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VGND B Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_27_368# B a_298_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_298_368# B a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_27_368# B a_298_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 VPWR A a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nor3b/sky130_fd_sc_ms__nor3b_1.cdl b/cells/nor3b/sky130_fd_sc_ms__nor3b_1.cdl
index cc45cf1..8b4683f 100644
--- a/cells/nor3b/sky130_fd_sc_ms__nor3b_1.cdl
+++ b/cells/nor3b/sky130_fd_sc_ms__nor3b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__nor3b_1 A B C_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 C C_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 Y B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 Y C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nor3b_1
diff --git a/cells/nor3b/sky130_fd_sc_ms__nor3b_1.netlist.tsv b/cells/nor3b/sky130_fd_sc_ms__nor3b_1.netlist.tsv
index 7e2d391..f7ac7a4 100644
--- a/cells/nor3b/sky130_fd_sc_ms__nor3b_1.netlist.tsv
+++ b/cells/nor3b/sky130_fd_sc_ms__nor3b_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__nor3b_1	A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3b/sky130_fd_sc_ms__nor3b_1.spice b/cells/nor3b/sky130_fd_sc_ms__nor3b_1.spice
index 0184fb6..4b1d5a5 100644
--- a/cells/nor3b/sky130_fd_sc_ms__nor3b_1.spice
+++ b/cells/nor3b/sky130_fd_sc_ms__nor3b_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__nor3b_1 A B C_N VGND VNB VPB VPWR Y
-M1000 Y a_27_112# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.477e+11p pd=4.17e+06u as=5.8515e+11p ps=4.58e+06u
-M1001 Y a_27_112# a_347_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=4.368e+11p ps=3.02e+06u
-M1002 a_347_368# B a_263_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.688e+11p ps=2.72e+06u
-M1003 a_263_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=4.06e+11p ps=3.02e+06u
-M1004 VGND C_N a_27_112# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=2.695e+11p ps=2.08e+06u
-M1005 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR C_N a_27_112# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1007 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_347_368# a_27_112# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_27_112# C_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X2 a_27_112# C_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 VPWR A a_263_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VGND a_27_112# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_263_368# B a_347_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/nor3b/sky130_fd_sc_ms__nor3b_2.cdl b/cells/nor3b/sky130_fd_sc_ms__nor3b_2.cdl
index 5a24017..4302b30 100644
--- a/cells/nor3b/sky130_fd_sc_ms__nor3b_2.cdl
+++ b/cells/nor3b/sky130_fd_sc_ms__nor3b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__nor3b_2 A B C_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 C C_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 Y B VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 Y C VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VNB nfet_01v8_lvt m=1 w=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_ms__nor3b_2
diff --git a/cells/nor3b/sky130_fd_sc_ms__nor3b_2.netlist.tsv b/cells/nor3b/sky130_fd_sc_ms__nor3b_2.netlist.tsv
index f39ab71..4e4f0fd 100644
--- a/cells/nor3b/sky130_fd_sc_ms__nor3b_2.netlist.tsv
+++ b/cells/nor3b/sky130_fd_sc_ms__nor3b_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__nor3b_2	A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3b/sky130_fd_sc_ms__nor3b_2.spice b/cells/nor3b/sky130_fd_sc_ms__nor3b_2.spice
index 1ce189c..c83ab34 100644
--- a/cells/nor3b/sky130_fd_sc_ms__nor3b_2.spice
+++ b/cells/nor3b/sky130_fd_sc_ms__nor3b_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__nor3b_2 A B C_N VGND VNB VPB VPWR Y
-M1000 VGND a_27_392# Y VNB nlowvt w=740000u l=150000u
-+  ad=1.6739e+12p pd=1.049e+07u as=6.697e+11p ps=6.25e+06u
-M1001 Y B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR C_N a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=8.91e+11p pd=8.13e+06u as=2.75e+11p ps=2.55e+06u
-M1004 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y a_27_392# a_227_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=9.184e+11p ps=8.36e+06u
-M1006 a_227_368# a_27_392# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_498_368# B a_227_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1008 VGND C_N a_27_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1009 a_498_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_227_368# B a_498_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A a_498_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y a_27_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_27_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_27_392# C_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND a_27_392# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VGND B Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_227_368# a_27_392# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VPWR A a_498_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_227_368# B a_498_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 Y a_27_392# a_227_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_27_392# C_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 a_498_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_498_368# B a_227_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nor3b/sky130_fd_sc_ms__nor3b_4.cdl b/cells/nor3b/sky130_fd_sc_ms__nor3b_4.cdl
index 536dc0b..5275760 100644
--- a/cells/nor3b/sky130_fd_sc_ms__nor3b_4.cdl
+++ b/cells/nor3b/sky130_fd_sc_ms__nor3b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__nor3b_4 A B C_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 C C_N VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 Y B VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 Y C VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nor3b_4
diff --git a/cells/nor3b/sky130_fd_sc_ms__nor3b_4.netlist.tsv b/cells/nor3b/sky130_fd_sc_ms__nor3b_4.netlist.tsv
index d85e818..f4936a5 100644
--- a/cells/nor3b/sky130_fd_sc_ms__nor3b_4.netlist.tsv
+++ b/cells/nor3b/sky130_fd_sc_ms__nor3b_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__nor3b_4	A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3b/sky130_fd_sc_ms__nor3b_4.spice b/cells/nor3b/sky130_fd_sc_ms__nor3b_4.spice
index 372cf3b..80f500a 100644
--- a/cells/nor3b/sky130_fd_sc_ms__nor3b_4.spice
+++ b/cells/nor3b/sky130_fd_sc_ms__nor3b_4.spice
@@ -16,58 +16,31 @@
 
 
 .subckt sky130_fd_sc_ms__nor3b_4 A B C_N VGND VNB VPB VPWR Y
-M1000 VGND a_468_264# Y VNB nlowvt w=740000u l=150000u
-+  ad=2.0498e+12p pd=1.59e+07u as=1.3135e+12p ps=1.243e+07u
-M1001 a_27_368# B a_129_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.5904e+12p pd=1.404e+07u as=1.2936e+12p ps=1.127e+07u
-M1002 Y a_468_264# a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1003 a_129_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=1.2838e+12p ps=1.087e+07u
-M1004 Y a_468_264# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_368# a_468_264# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_129_368# B a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_368# B a_129_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_468_264# a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_129_368# B a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_368# a_468_264# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_129_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_468_264# C_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=6.771e+11p pd=3.31e+06u as=0p ps=0u
-M1015 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y a_468_264# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_129_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_468_264# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A a_129_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_468_264# C_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1023 VPWR C_N a_468_264# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_468_264# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VPWR A a_129_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VGND B Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND a_468_264# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VGND a_468_264# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VGND B Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR C_N a_468_264# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 a_27_368# a_468_264# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_27_368# B a_129_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_27_368# a_468_264# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 Y a_468_264# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_27_368# B a_129_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VPWR A a_129_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VGND C_N a_468_264# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_129_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_129_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_129_368# B a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 a_468_264# C_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X22 Y a_468_264# a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 Y a_468_264# a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 a_129_368# B a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nor4/sky130_fd_sc_ms__nor4_1.cdl b/cells/nor4/sky130_fd_sc_ms__nor4_1.cdl
index 5fd49c3..a040337 100644
--- a/cells/nor4/sky130_fd_sc_ms__nor4_1.cdl
+++ b/cells/nor4/sky130_fd_sc_ms__nor4_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__nor4_1 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP1 sndPA B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP2 sndPB C VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP3 sndPC D VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN0 Y A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN1 Y B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN2 Y C VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN3 Y D VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
+MMN0 Y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.028 perim=0.76
+MMN1 Y B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.028 perim=0.76
+MMN2 Y C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.028 perim=0.76
+MMN3 Y D VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_ms__nor4_1
diff --git a/cells/nor4/sky130_fd_sc_ms__nor4_1.netlist.tsv b/cells/nor4/sky130_fd_sc_ms__nor4_1.netlist.tsv
index f5cee9b..02a501e 100644
--- a/cells/nor4/sky130_fd_sc_ms__nor4_1.netlist.tsv
+++ b/cells/nor4/sky130_fd_sc_ms__nor4_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__nor4_1	A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP2	MOSFET	sndPB	C	sndPC	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP3	MOSFET	sndPC	D	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN2	MOSFET	Y	C	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN3	MOSFET	Y	D	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/nor4/sky130_fd_sc_ms__nor4_1.spice b/cells/nor4/sky130_fd_sc_ms__nor4_1.spice
index 2ac4603..27792ae 100644
--- a/cells/nor4/sky130_fd_sc_ms__nor4_1.spice
+++ b/cells/nor4/sky130_fd_sc_ms__nor4_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__nor4_1 A B C D VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=8.7975e+11p ps=6.9e+06u
-M1001 a_147_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.688e+11p pd=2.72e+06u as=3.136e+11p ps=2.8e+06u
-M1002 a_345_368# C a_231_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=4.368e+11p pd=3.02e+06u as=4.368e+11p ps=3.02e+06u
-M1003 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y C VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_231_368# B a_147_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y D a_345_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1007 VGND D Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_147_368# B a_231_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_345_368# D Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR A a_147_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VGND C Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_231_368# C a_345_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nor4/sky130_fd_sc_ms__nor4_2.cdl b/cells/nor4/sky130_fd_sc_ms__nor4_2.cdl
index b2cb5ed..5ec20a7 100644
--- a/cells/nor4/sky130_fd_sc_ms__nor4_2.cdl
+++ b/cells/nor4/sky130_fd_sc_ms__nor4_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__nor4_2 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP1 sndPA B VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP2 sndPB C VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP3 sndPC D VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN0 Y A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN1 Y B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN2 Y C VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN3 Y D VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
+MMN0 Y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.028 perim=0.76
+MMN1 Y B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.028 perim=0.76
+MMN2 Y C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.028 perim=0.76
+MMN3 Y D VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_ms__nor4_2
diff --git a/cells/nor4/sky130_fd_sc_ms__nor4_2.netlist.tsv b/cells/nor4/sky130_fd_sc_ms__nor4_2.netlist.tsv
index f8d1623..ba4aed2 100644
--- a/cells/nor4/sky130_fd_sc_ms__nor4_2.netlist.tsv
+++ b/cells/nor4/sky130_fd_sc_ms__nor4_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__nor4_2	A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP2	MOSFET	sndPB	C	sndPC	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP3	MOSFET	sndPC	D	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN2	MOSFET	Y	C	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN3	MOSFET	Y	D	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/nor4/sky130_fd_sc_ms__nor4_2.spice b/cells/nor4/sky130_fd_sc_ms__nor4_2.spice
index bb53627..a34068c 100644
--- a/cells/nor4/sky130_fd_sc_ms__nor4_2.spice
+++ b/cells/nor4/sky130_fd_sc_ms__nor4_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__nor4_2 A B C D VGND VNB VPB VPWR Y
-M1000 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=9.064e+11p pd=7.51e+06u as=4.44e+11p ps=4.16e+06u
-M1001 a_119_368# C a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.216e+11p pd=5.59e+06u as=9.632e+11p ps=8.44e+06u
-M1002 VGND C Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_493_368# B a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=7.056e+11p pd=5.74e+06u as=0p ps=0u
-M1004 Y D a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1005 Y D VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_119_368# D Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_493_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1008 a_27_368# C a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_493_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_368# B a_493_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_493_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_493_368# B a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VGND D Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_119_368# C a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VPWR A a_493_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_27_368# C a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_119_368# D Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 Y C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_27_368# B a_493_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 Y D a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VGND B Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nor4/sky130_fd_sc_ms__nor4_4.cdl b/cells/nor4/sky130_fd_sc_ms__nor4_4.cdl
index ce697bf..0c12997 100644
--- a/cells/nor4/sky130_fd_sc_ms__nor4_4.cdl
+++ b/cells/nor4/sky130_fd_sc_ms__nor4_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__nor4_4 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP1 sndPA B VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP2 sndPB C VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP3 sndPC D VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN0 Y A VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN1 Y B VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN2 Y C VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN3 Y D VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
+MMN0 Y A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.028 perim=0.76
+MMN1 Y B VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.028 perim=0.76
+MMN2 Y C VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.028 perim=0.76
+MMN3 Y D VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_ms__nor4_4
diff --git a/cells/nor4/sky130_fd_sc_ms__nor4_4.netlist.tsv b/cells/nor4/sky130_fd_sc_ms__nor4_4.netlist.tsv
index 58d2ae3..c39950f 100644
--- a/cells/nor4/sky130_fd_sc_ms__nor4_4.netlist.tsv
+++ b/cells/nor4/sky130_fd_sc_ms__nor4_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__nor4_4	A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP2	MOSFET	sndPB	C	sndPC	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP3	MOSFET	sndPC	D	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN2	MOSFET	Y	C	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN3	MOSFET	Y	D	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/nor4/sky130_fd_sc_ms__nor4_4.spice b/cells/nor4/sky130_fd_sc_ms__nor4_4.spice
index a606fd0..9a3091b 100644
--- a/cells/nor4/sky130_fd_sc_ms__nor4_4.spice
+++ b/cells/nor4/sky130_fd_sc_ms__nor4_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__nor4_4 A B C D VGND VNB VPB VPWR Y
-M1000 a_499_368# B a_879_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2096e+12p pd=1.112e+07u as=1.5568e+12p ps=1.398e+07u
-M1001 VGND D Y VNB nlowvt w=740000u l=150000u
-+  ad=2.6973e+12p pd=1.469e+07u as=2.4864e+12p ps=1.264e+07u
-M1002 Y D a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.608e+11p pd=5.66e+06u as=1.5904e+12p ps=1.404e+07u
-M1003 a_27_368# D Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_368# D Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_879_368# B a_499_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y D a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_499_368# C a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_879_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=8.288e+11p ps=5.96e+06u
-M1009 Y B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_499_368# B a_879_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_879_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_368# C a_499_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_879_368# B a_499_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND C Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_499_368# C a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_368# C a_499_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A a_879_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_879_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y D VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y C VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_879_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VGND D Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_27_368# C a_499_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_27_368# C a_499_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_499_368# B a_879_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_27_368# D Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_879_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_27_368# D Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 VGND B Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VGND C Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 Y D a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VPWR A a_879_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_499_368# C a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_879_368# B a_499_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_879_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 Y C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_499_368# C a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 Y D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 a_879_368# B a_499_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 Y D a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_499_368# B a_879_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/nor4b/sky130_fd_sc_ms__nor4b_1.cdl b/cells/nor4b/sky130_fd_sc_ms__nor4b_1.cdl
index 9b8fe19..228387a 100644
--- a/cells/nor4b/sky130_fd_sc_ms__nor4b_1.cdl
+++ b/cells/nor4b/sky130_fd_sc_ms__nor4b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__nor4b_1 A B C D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 D D_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 Y B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 Y C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 Y D VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nor4b_1
diff --git a/cells/nor4b/sky130_fd_sc_ms__nor4b_1.netlist.tsv b/cells/nor4b/sky130_fd_sc_ms__nor4b_1.netlist.tsv
index 07e2365..a3bd13c 100644
--- a/cells/nor4b/sky130_fd_sc_ms__nor4b_1.netlist.tsv
+++ b/cells/nor4b/sky130_fd_sc_ms__nor4b_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__nor4b_1	A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4b/sky130_fd_sc_ms__nor4b_1.spice b/cells/nor4b/sky130_fd_sc_ms__nor4b_1.spice
index d5f8969..4c780b9 100644
--- a/cells/nor4b/sky130_fd_sc_ms__nor4b_1.spice
+++ b/cells/nor4b/sky130_fd_sc_ms__nor4b_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__nor4b_1 A B C D_N VGND VNB VPB VPWR Y
-M1000 Y C VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=8.594e+11p ps=6.85e+06u
-M1001 a_347_368# B a_263_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.696e+11p pd=2.9e+06u as=2.688e+11p ps=2.72e+06u
-M1002 VGND a_57_368# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND D_N a_57_368# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1005 Y a_57_368# a_449_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=4.48e+11p pd=3.04e+06u as=4.368e+11p ps=3.02e+06u
-M1006 a_263_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=4.06e+11p ps=3.02e+06u
-M1007 a_449_368# C a_347_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR D_N a_57_368# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1009 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_57_368# D_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 VPWR A a_263_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VGND C Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_347_368# C a_449_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_57_368# D_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X7 a_449_368# a_57_368# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_263_368# B a_347_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 Y a_57_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nor4b/sky130_fd_sc_ms__nor4b_2.cdl b/cells/nor4b/sky130_fd_sc_ms__nor4b_2.cdl
index c6b28fc..7011241 100644
--- a/cells/nor4b/sky130_fd_sc_ms__nor4b_2.cdl
+++ b/cells/nor4b/sky130_fd_sc_ms__nor4b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__nor4b_2 A B C D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 D D_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 Y B VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 Y C VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 Y D VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VNB nfet_01v8_lvt m=1 w=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_ms__nor4b_2
diff --git a/cells/nor4b/sky130_fd_sc_ms__nor4b_2.netlist.tsv b/cells/nor4b/sky130_fd_sc_ms__nor4b_2.netlist.tsv
index 883847d..efb26bc 100644
--- a/cells/nor4b/sky130_fd_sc_ms__nor4b_2.netlist.tsv
+++ b/cells/nor4b/sky130_fd_sc_ms__nor4b_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__nor4b_2	A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4b/sky130_fd_sc_ms__nor4b_2.spice b/cells/nor4b/sky130_fd_sc_ms__nor4b_2.spice
index 33e6446..550dae3 100644
--- a/cells/nor4b/sky130_fd_sc_ms__nor4b_2.spice
+++ b/cells/nor4b/sky130_fd_sc_ms__nor4b_2.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ms__nor4b_2 A B C D_N VGND VNB VPB VPWR Y
-M1000 VGND D_N a_27_392# VNB nlowvt w=640000u l=150000u
-+  ad=1.7479e+12p pd=1.217e+07u as=1.824e+11p ps=1.85e+06u
-M1001 VPWR D_N a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=5.936e+11p pd=5.36e+06u as=2.8e+11p ps=2.56e+06u
-M1002 Y B VGND VNB nlowvt w=740000u l=150000u
-+  ad=9.879e+11p pd=8.59e+06u as=0p ps=0u
-M1003 a_701_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=9.296e+11p pd=8.38e+06u as=0p ps=0u
-M1004 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_501_368# B a_701_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1006 VGND a_27_392# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_701_368# B a_501_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A a_701_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_27_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND C Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y a_27_392# a_229_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=9.296e+11p ps=8.38e+06u
-M1013 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_229_368# a_27_392# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_501_368# C a_229_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_229_368# C a_501_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y C VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VGND a_27_392# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VGND C Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR A a_701_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 Y a_27_392# a_229_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_501_368# C a_229_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_701_368# B a_501_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_701_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_229_368# a_27_392# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_229_368# C a_501_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_27_392# D_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 VGND B Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_27_392# D_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 a_501_368# B a_701_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 Y a_27_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/nor4b/sky130_fd_sc_ms__nor4b_4.cdl b/cells/nor4b/sky130_fd_sc_ms__nor4b_4.cdl
index ab98314..54f1384 100644
--- a/cells/nor4b/sky130_fd_sc_ms__nor4b_4.cdl
+++ b/cells/nor4b/sky130_fd_sc_ms__nor4b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__nor4b_4 A B C D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 D D_N VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 Y B VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 Y C VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 Y D VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nor4b_4
diff --git a/cells/nor4b/sky130_fd_sc_ms__nor4b_4.netlist.tsv b/cells/nor4b/sky130_fd_sc_ms__nor4b_4.netlist.tsv
index bc5eacd..8b7a0d6 100644
--- a/cells/nor4b/sky130_fd_sc_ms__nor4b_4.netlist.tsv
+++ b/cells/nor4b/sky130_fd_sc_ms__nor4b_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__nor4b_4	A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4b/sky130_fd_sc_ms__nor4b_4.spice b/cells/nor4b/sky130_fd_sc_ms__nor4b_4.spice
index 06e2e9a..ab0cce1 100644
--- a/cells/nor4b/sky130_fd_sc_ms__nor4b_4.spice
+++ b/cells/nor4b/sky130_fd_sc_ms__nor4b_4.spice
@@ -16,74 +16,39 @@
 
 
 .subckt sky130_fd_sc_ms__nor4b_4 A B C D_N VGND VNB VPB VPWR Y
-M1000 a_781_368# C a_319_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.3496e+12p pd=1.137e+07u as=1.6744e+12p ps=1.419e+07u
-M1001 a_319_368# C a_781_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y a_47_88# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.7686e+12p pd=1.662e+07u as=3.0229e+12p ps=2.149e+07u
-M1003 VGND a_47_88# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND D_N a_47_88# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=3.1115e+11p ps=2.85e+06u
-M1011 VGND a_47_88# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_47_88# D_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=1.0752e+12p ps=1.004e+07u
-M1013 VPWR D_N a_47_88# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_781_368# B a_1191_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=1.5904e+12p ps=1.404e+07u
-M1015 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1191_368# B a_781_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_781_368# B a_1191_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1191_368# B a_781_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A a_1191_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1191_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y a_47_88# a_319_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1023 VPWR A a_1191_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y a_47_88# a_319_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y C VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_319_368# a_47_88# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_319_368# a_47_88# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y a_47_88# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y C VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_781_368# C a_319_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_319_368# C a_781_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1191_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND C Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_47_88# D_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 a_319_368# a_47_88# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_319_368# C a_781_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_319_368# C a_781_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y a_47_88# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 Y a_47_88# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 Y C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VGND B Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_319_368# a_47_88# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_781_368# C a_319_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_781_368# B a_1191_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_781_368# C a_319_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_1191_368# B a_781_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VPWR A a_1191_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 VPWR D_N a_47_88# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X19 VGND C Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_781_368# B a_1191_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 Y a_47_88# a_319_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 VGND C Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 VGND a_47_88# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 Y C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 a_1191_368# B a_781_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 Y a_47_88# a_319_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 a_1191_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X29 a_47_88# D_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X30 VGND B Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 a_1191_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 VGND a_47_88# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 VPWR A a_1191_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.cdl b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.cdl
index 296db0c..90a2762 100644
--- a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.cdl
+++ b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__nor4bb_1 A B C_N D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 C C_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 D D_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 Y C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 Y D VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nor4bb_1
diff --git a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.netlist.tsv b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.netlist.tsv
index 782040e..d847ae1 100644
--- a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.netlist.tsv
+++ b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__nor4bb_1	A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.spice b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.spice
index 894dcae..cf91d81 100644
--- a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.spice
+++ b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__nor4bb_1 A B C_N D_N VGND VNB VPB VPWR Y
-M1000 a_611_244# D_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=1.21035e+12p ps=6.39e+06u
-M1001 a_400_368# B a_316_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=5.432e+11p pd=3.21e+06u as=2.688e+11p ps=2.72e+06u
-M1002 a_533_368# a_27_112# a_400_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=4.368e+11p pd=3.02e+06u as=0p ps=0u
-M1003 VGND C_N a_27_112# VNB nlowvt w=550000u l=150000u
-+  ad=1.51135e+12p pd=8.63e+06u as=3.025e+11p ps=2.2e+06u
-M1004 a_611_244# D_N VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1005 Y a_611_244# a_533_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1006 VPWR C_N a_27_112# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1007 VGND a_611_244# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=5.18e+11p ps=4.36e+06u
-M1008 Y a_27_112# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_316_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VGND D_N a_611_244# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X2 a_400_368# a_27_112# a_533_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 Y a_611_244# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_27_112# C_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X6 a_533_368# a_611_244# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VPWR A a_316_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_316_368# B a_400_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VGND a_27_112# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VPWR D_N a_611_244# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X11 a_27_112# C_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
 .ends
diff --git a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.cdl b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.cdl
index 35eb643..1dd580b 100644
--- a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.cdl
+++ b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__nor4bb_2 A B C_N D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 C C_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 D D_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 Y C VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 Y D VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VNB nfet_01v8_lvt m=1 w=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_ms__nor4bb_2
diff --git a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.netlist.tsv b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.netlist.tsv
index 82ea6f8..6899789 100644
--- a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.netlist.tsv
+++ b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__nor4bb_2	A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.spice b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.spice
index 20041bb..857477d 100644
--- a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.spice
+++ b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__nor4bb_2 A B C_N D_N VGND VNB VPB VPWR Y
-M1000 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=2.32715e+12p pd=1.585e+07u as=8.621e+11p ps=8.25e+06u
-M1001 Y a_311_124# a_493_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=9.856e+11p ps=8.48e+06u
-M1002 Y B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR C_N a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=1.4424e+12p pd=7.06e+06u as=2.8e+11p ps=2.56e+06u
-M1004 a_775_368# a_27_392# a_493_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.608e+11p pd=5.66e+06u as=0p ps=0u
-M1005 a_493_368# a_27_392# a_775_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_775_368# B a_985_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=9.856e+11p ps=8.48e+06u
-M1007 a_493_368# a_311_124# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A a_985_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_311_124# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_985_368# B a_775_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_27_392# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_985_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_311_124# D_N VGND VNB nlowvt w=640000u l=150000u
-+  ad=2.496e+11p pd=2.06e+06u as=0p ps=0u
-M1014 a_311_124# D_N VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1015 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_311_124# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y a_27_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND C_N a_27_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
+X0 a_985_368# B a_775_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VGND D_N a_311_124# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 VGND a_27_392# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND B Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_27_392# C_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 VPWR D_N a_311_124# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 VPWR A a_985_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y a_27_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 Y a_311_124# a_493_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_775_368# B a_985_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_493_368# a_27_392# a_775_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_985_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 Y a_311_124# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_775_368# a_27_392# a_493_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VGND a_311_124# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_27_392# C_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X19 a_493_368# a_311_124# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.cdl b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.cdl
index 5a43894..0b70060 100644
--- a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.cdl
+++ b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__nor4bb_4 A B C_N D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 C C_N VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 D D_N VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 Y C VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 Y D VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__nor4bb_4
diff --git a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.netlist.tsv b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.netlist.tsv
index c60b49b..39182f8 100644
--- a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.netlist.tsv
+++ b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__nor4bb_4	A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.spice b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.spice
index 9aef49e..1222681 100644
--- a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.spice
+++ b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_ms__nor4bb_4 A B C_N D_N VGND VNB VPB VPWR Y
-M1000 Y B VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.8722e+12p pd=1.69e+07u as=3.2708e+12p ps=2.364e+07u
-M1001 a_119_368# B a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.39982e+12p pd=1.162e+07u as=1.8479e+12p ps=1.49e+07u
-M1002 a_27_368# B a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_1162_48# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y a_1162_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR D_N a_1162_48# VPB pshort w=840000u l=180000u
-+  ad=1.5008e+12p pd=1.264e+07u as=2.268e+11p ps=2.22e+06u
-M1006 a_1162_48# D_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1007 a_119_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_864_48# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y a_864_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_119_368# B a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_864_48# C_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1015 VGND A Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_1162_48# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR C_N a_864_48# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_864_48# C_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1021 a_900_349# a_864_48# a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.6184e+12p pd=1.185e+07u as=0p ps=0u
-M1022 a_119_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1162_48# D_N VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_368# a_864_48# a_900_349# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_900_349# a_864_48# a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y a_1162_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y a_1162_48# a_900_349# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1029 Y a_1162_48# a_900_349# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_900_349# a_1162_48# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_900_349# a_1162_48# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_27_368# a_864_48# a_900_349# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND B Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 Y a_864_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND a_864_48# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_27_368# B a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_864_48# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 Y a_1162_48# a_900_349# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y a_1162_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND B Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VGND a_864_48# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VPWR A a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_900_349# a_1162_48# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_900_349# a_864_48# a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 VGND a_1162_48# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VGND D_N a_1162_48# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_27_368# B a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VGND B Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_900_349# a_1162_48# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_864_48# C_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X17 a_27_368# B a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 a_900_349# a_864_48# a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 VPWR D_N a_1162_48# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X20 VGND a_1162_48# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 a_119_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_119_368# B a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_27_368# a_864_48# a_900_349# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 VGND C_N a_864_48# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 Y a_1162_48# a_900_349# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 Y A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 Y a_1162_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 a_27_368# a_864_48# a_900_349# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X29 Y B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X30 Y a_864_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 a_119_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 VPWR A a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X33 a_1162_48# D_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X34 a_119_368# B a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X35 VGND A Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X36 VPWR C_N a_864_48# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X37 Y a_864_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o2111a/sky130_fd_sc_ms__o2111a_1.cdl b/cells/o2111a/sky130_fd_sc_ms__o2111a_1.cdl
index 9e6ea9d..7ec110a 100644
--- a/cells/o2111a/sky130_fd_sc_ms__o2111a_1.cdl
+++ b/cells/o2111a/sky130_fd_sc_ms__o2111a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__o2111a_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 VPWR D1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPD0 VPWR D1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 pndC C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMND0 y D1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 pndC C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMND0 y D1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o2111a_1
diff --git a/cells/o2111a/sky130_fd_sc_ms__o2111a_1.netlist.tsv b/cells/o2111a/sky130_fd_sc_ms__o2111a_1.netlist.tsv
index 3b7f4d1..e202d18 100644
--- a/cells/o2111a/sky130_fd_sc_ms__o2111a_1.netlist.tsv
+++ b/cells/o2111a/sky130_fd_sc_ms__o2111a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__o2111a_1	A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	y	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	pndC	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	VPWR	D1	y	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	pndC	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111a/sky130_fd_sc_ms__o2111a_1.spice b/cells/o2111a/sky130_fd_sc_ms__o2111a_1.spice
index 58f9fd4..7ecced5 100644
--- a/cells/o2111a/sky130_fd_sc_ms__o2111a_1.spice
+++ b/cells/o2111a/sky130_fd_sc_ms__o2111a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__o2111a_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 a_393_74# C1 a_321_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=1.554e+11p ps=1.9e+06u
-M1001 a_471_74# B1 a_393_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.773e+11p pd=4.25e+06u as=0p ps=0u
-M1002 a_82_48# B1 VPWR VPB pshort w=840000u l=180000u
-+  ad=6.118e+11p pd=5.03e+06u as=1.20678e+12p ps=8.51e+06u
-M1003 VPWR a_82_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1004 VGND A2 a_471_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.921e+11p pd=4.29e+06u as=0p ps=0u
-M1005 VPWR C1 a_82_48# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_603_381# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1007 VGND a_82_48# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.035e+11p ps=2.03e+06u
-M1008 a_82_48# D1 VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_471_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_603_381# A2 a_82_48# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_321_74# D1 a_82_48# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.59e+11p ps=2.18e+06u
+X0 VPWR D1 a_82_48# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 X a_82_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_393_74# B1 a_471_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR B1 a_82_48# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X4 a_321_74# C1 a_393_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_82_48# C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X6 a_603_381# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 X a_82_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_82_48# A2 a_603_381# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 a_471_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND A1 a_471_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_82_48# D1 a_321_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o2111a/sky130_fd_sc_ms__o2111a_2.cdl b/cells/o2111a/sky130_fd_sc_ms__o2111a_2.cdl
index d81be63..a10cfeb 100644
--- a/cells/o2111a/sky130_fd_sc_ms__o2111a_2.cdl
+++ b/cells/o2111a/sky130_fd_sc_ms__o2111a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__o2111a_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 VPWR D1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPD0 VPWR D1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 pndC C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMND0 y D1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 pndC C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMND0 y D1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o2111a_2
diff --git a/cells/o2111a/sky130_fd_sc_ms__o2111a_2.netlist.tsv b/cells/o2111a/sky130_fd_sc_ms__o2111a_2.netlist.tsv
index db90d7d..2ab808d 100644
--- a/cells/o2111a/sky130_fd_sc_ms__o2111a_2.netlist.tsv
+++ b/cells/o2111a/sky130_fd_sc_ms__o2111a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__o2111a_2	A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	pndC	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	VPWR	D1	y	VPB	pfet_01v8	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	pndC	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111a/sky130_fd_sc_ms__o2111a_2.spice b/cells/o2111a/sky130_fd_sc_ms__o2111a_2.spice
index 99ec208..a97c852 100644
--- a/cells/o2111a/sky130_fd_sc_ms__o2111a_2.spice
+++ b/cells/o2111a/sky130_fd_sc_ms__o2111a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__o2111a_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 VPWR D1 a_239_368# VPB pshort w=1e+06u l=180000u
-+  ad=1.9396e+12p pd=1.222e+07u as=7.1e+11p ps=5.42e+06u
-M1001 VPWR a_239_368# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.024e+11p ps=2.78e+06u
-M1002 a_239_368# C1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_54_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=5.217e+11p pd=4.37e+06u as=7.955e+11p ps=6.59e+06u
-M1004 VGND a_239_368# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1005 a_461_74# C1 a_369_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=2.294e+11p ps=2.1e+06u
-M1006 a_155_368# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1007 VGND A1 a_54_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_239_368# D1 a_461_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1009 X a_239_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR B1 a_239_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_239_368# A2 a_155_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_239_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_369_74# B1 a_54_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_155_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 X a_239_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_369_74# C1 a_461_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 X a_239_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_54_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VPWR C1 a_239_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_54_74# B1 a_369_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_461_74# D1 a_239_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_239_368# D1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 VGND A2 a_54_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_155_368# A2 a_239_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 VPWR a_239_368# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_239_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 VGND a_239_368# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o2111a/sky130_fd_sc_ms__o2111a_4.cdl b/cells/o2111a/sky130_fd_sc_ms__o2111a_4.cdl
index 5f24f72..f63b63b 100644
--- a/cells/o2111a/sky130_fd_sc_ms__o2111a_4.cdl
+++ b/cells/o2111a/sky130_fd_sc_ms__o2111a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__o2111a_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 VPWR D1 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPD0 VPWR D1 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 pndC C1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMND0 y D1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 pndC C1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMND0 y D1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o2111a_4
diff --git a/cells/o2111a/sky130_fd_sc_ms__o2111a_4.netlist.tsv b/cells/o2111a/sky130_fd_sc_ms__o2111a_4.netlist.tsv
index a0ccfc5..3431f0a 100644
--- a/cells/o2111a/sky130_fd_sc_ms__o2111a_4.netlist.tsv
+++ b/cells/o2111a/sky130_fd_sc_ms__o2111a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__o2111a_4	A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	y	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	pndC	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	VPWR	D1	y	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	pndC	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111a/sky130_fd_sc_ms__o2111a_4.spice b/cells/o2111a/sky130_fd_sc_ms__o2111a_4.spice
index 5c95935..bdc01d4 100644
--- a/cells/o2111a/sky130_fd_sc_ms__o2111a_4.spice
+++ b/cells/o2111a/sky130_fd_sc_ms__o2111a_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__o2111a_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 VPWR D1 a_27_392# VPB pshort w=840000u l=180000u
-+  ad=2.1934e+12p pd=1.825e+07u as=1.5046e+12p ps=1.239e+07u
-M1001 a_287_74# C1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=6.6465e+11p ps=6.59e+06u
-M1002 a_27_392# A2 a_750_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.9e+11p ps=5.18e+06u
-M1003 a_750_392# A2 a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_287_74# B1 a_477_198# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=8.5105e+11p ps=8.36e+06u
-M1005 a_477_198# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.295e+12p ps=1.09e+07u
-M1006 X a_27_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1007 a_477_198# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_74# C1 a_287_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_27_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_392# D1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1011 a_27_74# D1 a_27_392# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_27_392# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR B1 a_27_392# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A1 a_477_198# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_27_392# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=6.608e+11p ps=5.66e+06u
-M1016 X a_27_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_27_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_750_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_27_392# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_392# B1 VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_27_392# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A1 a_750_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_392# D1 VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_392# C1 VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR C1 a_27_392# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_477_198# B1 a_287_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A2 a_477_198# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_27_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_27_74# C1 a_287_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VPWR A1 a_750_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 a_27_392# D1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VGND a_27_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 X a_27_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_287_74# C1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_287_74# B1 a_477_198# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_477_198# B1 a_287_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_27_392# C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X10 VPWR a_27_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_477_198# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_27_392# A2 a_750_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 VGND A1 a_477_198# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VGND a_27_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_750_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 VPWR C1 a_27_392# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X17 VGND A2 a_477_198# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 VPWR a_27_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 X a_27_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_750_392# A2 a_27_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X21 a_477_198# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 a_27_74# D1 a_27_392# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 VPWR D1 a_27_392# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X24 a_27_392# D1 VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X25 a_27_392# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X26 X a_27_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 VPWR B1 a_27_392# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
 .ends
diff --git a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.cdl b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.cdl
index d883769..71d7d84 100644
--- a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.cdl
+++ b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o2111ai_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPD0 VPWR D1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 VPWR D1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 pndC C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMND0 Y D1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 pndC C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMND0 Y D1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o2111ai_1
diff --git a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.netlist.tsv b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.netlist.tsv
index bb764a7..ad4dac1 100644
--- a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.netlist.tsv
+++ b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o2111ai_1	A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	pndC	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	VPWR	D1	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	pndC	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.spice b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.spice
index 9b08cb1..5c5388a 100644
--- a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.spice
+++ b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__o2111ai_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 a_368_74# B1 a_260_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.773e+11p pd=4.25e+06u as=2.886e+11p ps=2.26e+06u
-M1001 VPWR A1 a_493_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.1872e+12p pd=8.84e+06u as=3.08e+11p ps=2.79e+06u
-M1002 VGND A2 a_368_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.256e+11p pd=2.36e+06u as=0p ps=0u
-M1003 a_493_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=6.328e+11p ps=5.61e+06u
-M1004 Y B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_368_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_182_74# D1 Y VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=4.625e+11p ps=2.73e+06u
-M1007 a_260_74# C1 a_182_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y D1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_493_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VGND A1 a_368_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_368_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_260_74# B1 a_368_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR D1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y A2 a_493_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_182_74# C1 a_260_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 Y D1 a_182_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.cdl b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.cdl
index 235803e..896b72a 100644
--- a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.cdl
+++ b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o2111ai_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPD0 VPWR D1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 VPWR D1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 pndC C1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMND0 Y D1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 pndC C1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMND0 Y D1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o2111ai_2
diff --git a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.netlist.tsv b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.netlist.tsv
index 281a7cb..429700d 100644
--- a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.netlist.tsv
+++ b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o2111ai_2	A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	pndC	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	VPWR	D1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	pndC	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.spice b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.spice
index f23080e..10a7145 100644
--- a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.spice
+++ b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__o2111ai_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 a_510_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=8.362e+11p pd=8.18e+06u as=4.81e+11p ps=4.26e+06u
-M1001 a_40_74# C1 a_299_74# VNB nlowvt w=740000u l=150000u
-+  ad=6.29e+11p pd=6.14e+06u as=5.18e+11p ps=4.36e+06u
-M1002 a_299_74# C1 a_40_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A2 a_697_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2096e+12p pd=1.112e+07u as=9.296e+11p ps=8.38e+06u
-M1004 a_510_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_697_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_697_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.6464e+12p pd=1.414e+07u as=0p ps=0u
-M1007 a_510_74# B1 a_299_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_697_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_299_74# B1 a_510_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A1 a_510_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y D1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR D1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y C1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_40_74# D1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1015 VPWR C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y D1 a_40_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A2 a_510_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_510_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_697_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VGND A2 a_510_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_299_74# B1 a_510_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VGND A1 a_510_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_697_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 Y D1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_510_74# B1 a_299_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_510_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_299_74# C1 a_40_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VPWR D1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_40_74# D1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 Y A2 a_697_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_40_74# C1 a_299_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 Y D1 a_40_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 VPWR A1 a_697_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.cdl b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.cdl
index 430229f..5482260 100644
--- a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.cdl
+++ b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o2111ai_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPD0 VPWR D1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 VPWR D1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 pndC C1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMND0 Y D1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 pndC C1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMND0 Y D1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o2111ai_4
diff --git a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.netlist.tsv b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.netlist.tsv
index c467e30..1b689e6 100644
--- a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.netlist.tsv
+++ b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o2111ai_4	A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	pndC	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	VPWR	D1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	pndC	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.spice b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.spice
index aa9ad24..664047b 100644
--- a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.spice
+++ b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ms__o2111ai_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 a_954_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=2.8616e+12p pd=1.631e+07u as=2.7776e+12p ps=1.84e+07u
-M1001 a_27_74# C1 a_472_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.0434e+12p pd=1.022e+07u as=8.288e+11p ps=8.16e+06u
-M1002 a_841_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.5688e+12p pd=1.46e+07u as=9.324e+11p ps=8.44e+06u
-M1003 a_841_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y D1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=2.2232e+12p ps=1.517e+07u
-M1005 a_841_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_74# C1 a_472_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_472_74# B1 a_841_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_954_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# D1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.662e+11p ps=4.22e+06u
-M1011 VGND A1 a_841_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR D1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_74# D1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_841_74# B1 a_472_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_841_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A2 a_954_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A2 a_841_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y C1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A1 a_841_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_472_74# C1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_841_74# B1 a_472_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_954_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_472_74# C1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR A1 a_954_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y D1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND A2 a_841_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_954_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_472_74# B1 a_841_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y D1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y A2 a_954_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_954_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# D1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VGND A1 a_841_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_472_74# C1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR A1 a_954_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_27_74# C1 a_472_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VGND A1 a_841_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VGND A2 a_841_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_954_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VPWR A1 a_954_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_841_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_841_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_27_74# C1 a_472_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VPWR D1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_841_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_472_74# B1 a_841_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 Y A2 a_954_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 Y D1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 a_472_74# C1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_841_74# B1 a_472_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_954_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_841_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_954_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 a_841_74# B1 a_472_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 a_954_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 Y D1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 Y D1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 VGND A2 a_841_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X30 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X31 Y A2 a_954_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 a_27_74# D1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 a_472_74# B1 a_841_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o211a/sky130_fd_sc_ms__o211a_1.cdl b/cells/o211a/sky130_fd_sc_ms__o211a_1.cdl
index 0b60ba7..d2ae570 100644
--- a/cells/o211a/sky130_fd_sc_ms__o211a_1.cdl
+++ b/cells/o211a/sky130_fd_sc_ms__o211a_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o211a_1 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=1 w=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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o211a_1
diff --git a/cells/o211a/sky130_fd_sc_ms__o211a_1.netlist.tsv b/cells/o211a/sky130_fd_sc_ms__o211a_1.netlist.tsv
index 9a5b82c..49004bb 100644
--- a/cells/o211a/sky130_fd_sc_ms__o211a_1.netlist.tsv
+++ b/cells/o211a/sky130_fd_sc_ms__o211a_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o211a_1	A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8	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	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211a/sky130_fd_sc_ms__o211a_1.spice b/cells/o211a/sky130_fd_sc_ms__o211a_1.spice
index a1a6ef3..9e43419 100644
--- a/cells/o211a/sky130_fd_sc_ms__o211a_1.spice
+++ b/cells/o211a/sky130_fd_sc_ms__o211a_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__o211a_1 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 VPWR a_83_264# X VPB pshort w=1.12e+06u l=180000u
-+  ad=2.11e+12p pd=8.4e+06u as=3.136e+11p ps=2.8e+06u
-M1001 a_83_264# C1 a_662_136# VNB nlowvt w=640000u l=150000u
-+  ad=2.112e+11p pd=1.94e+06u as=2.08e+11p ps=1.93e+06u
-M1002 VGND A1 a_257_136# VNB nlowvt w=640000u l=150000u
-+  ad=5.891e+11p pd=4.49e+06u as=6.816e+11p ps=4.69e+06u
-M1003 a_662_136# B1 a_257_136# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_401_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1005 a_257_136# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_83_264# C1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.5e+11p pd=5.1e+06u as=0p ps=0u
-M1007 a_83_264# A2 a_401_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B1 a_83_264# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_83_264# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
+X0 a_401_392# A2 a_83_264# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_257_136# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_662_136# C1 a_83_264# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 VPWR C1 a_83_264# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_257_136# B1 a_662_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_83_264# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 X a_83_264# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND A2 a_257_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 VPWR A1 a_401_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 X a_83_264# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o211a/sky130_fd_sc_ms__o211a_2.cdl b/cells/o211a/sky130_fd_sc_ms__o211a_2.cdl
index 4ccd8f9..1aff402 100644
--- a/cells/o211a/sky130_fd_sc_ms__o211a_2.cdl
+++ b/cells/o211a/sky130_fd_sc_ms__o211a_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o211a_2 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o211a_2
diff --git a/cells/o211a/sky130_fd_sc_ms__o211a_2.netlist.tsv b/cells/o211a/sky130_fd_sc_ms__o211a_2.netlist.tsv
index 920fbe0..a78a2cf 100644
--- a/cells/o211a/sky130_fd_sc_ms__o211a_2.netlist.tsv
+++ b/cells/o211a/sky130_fd_sc_ms__o211a_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o211a_2	A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211a/sky130_fd_sc_ms__o211a_2.spice b/cells/o211a/sky130_fd_sc_ms__o211a_2.spice
index 99e6a2f..87fdc88 100644
--- a/cells/o211a/sky130_fd_sc_ms__o211a_2.spice
+++ b/cells/o211a/sky130_fd_sc_ms__o211a_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__o211a_2 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_195_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.662e+11p pd=4.22e+06u as=7.498e+11p ps=6.7e+06u
-M1001 X a_27_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=1.4496e+12p ps=9.24e+06u
-M1002 VPWR a_27_368# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_27_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1004 a_195_74# B1 a_117_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1005 a_317_368# A2 a_27_368# VPB pshort w=1e+06u l=180000u
-+  ad=2.9e+11p pd=2.58e+06u as=5.5e+11p ps=5.1e+06u
-M1006 a_27_368# B1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR C1 a_27_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A1 a_317_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_27_368# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A2 a_195_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_117_74# C1 a_27_368# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
+X0 a_195_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 X a_27_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VGND a_27_368# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_317_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 X a_27_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_27_368# A2 a_317_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_117_74# B1 a_195_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_27_368# C1 a_117_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VGND A1 a_195_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR B1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 VPWR a_27_368# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_27_368# C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/o211a/sky130_fd_sc_ms__o211a_4.cdl b/cells/o211a/sky130_fd_sc_ms__o211a_4.cdl
index b90c5c9..3021531 100644
--- a/cells/o211a/sky130_fd_sc_ms__o211a_4.cdl
+++ b/cells/o211a/sky130_fd_sc_ms__o211a_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o211a_4 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=2 w=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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o211a_4
diff --git a/cells/o211a/sky130_fd_sc_ms__o211a_4.netlist.tsv b/cells/o211a/sky130_fd_sc_ms__o211a_4.netlist.tsv
index e4bce4a..f1aef61 100644
--- a/cells/o211a/sky130_fd_sc_ms__o211a_4.netlist.tsv
+++ b/cells/o211a/sky130_fd_sc_ms__o211a_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o211a_4	A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211a/sky130_fd_sc_ms__o211a_4.spice b/cells/o211a/sky130_fd_sc_ms__o211a_4.spice
index 2ec9a86..b36d61f 100644
--- a/cells/o211a/sky130_fd_sc_ms__o211a_4.spice
+++ b/cells/o211a/sky130_fd_sc_ms__o211a_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__o211a_4 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 VPWR C1 a_91_48# VPB pshort w=840000u l=180000u
-+  ad=2.3588e+12p pd=1.71e+07u as=7.736e+11p ps=7.08e+06u
-M1001 a_971_391# A2 a_91_48# VPB pshort w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=0p ps=0u
-M1002 VGND a_91_48# X VNB nlowvt w=740000u l=150000u
-+  ad=1.1032e+12p pd=1.016e+07u as=4.144e+11p ps=4.08e+06u
-M1003 a_91_48# A2 a_971_391# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_91_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1005 VPWR A1 a_971_391# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_91_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_91_48# C1 VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_91_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_91_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR B1 a_91_48# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_510_125# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=8.089e+11p pd=7.65e+06u as=0p ps=0u
-M1012 VGND A1 a_510_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_91_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_510_125# B1 a_597_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=4.032e+11p ps=3.82e+06u
-M1015 a_597_125# C1 a_91_48# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1016 X a_91_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_91_48# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_971_391# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_597_125# B1 a_510_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_91_48# C1 a_597_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A2 a_510_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_510_125# A1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_91_48# B1 VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR C1 a_91_48# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 VGND a_91_48# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VPWR B1 a_91_48# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 VPWR a_91_48# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 X a_91_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_510_125# B1 a_597_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 X a_91_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 X a_91_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VGND a_91_48# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_510_125# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_971_391# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_91_48# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X12 a_91_48# C1 a_597_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 a_597_125# C1 a_91_48# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 VGND A2 a_510_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 VPWR A1 a_971_391# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 a_91_48# C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X17 a_510_125# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X18 VPWR a_91_48# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_971_391# A2 a_91_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X20 a_597_125# B1 a_510_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X21 X a_91_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 VGND A1 a_510_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X23 a_91_48# A2 a_971_391# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/o211ai/sky130_fd_sc_ms__o211ai_1.cdl b/cells/o211ai/sky130_fd_sc_ms__o211ai_1.cdl
index 2c361f3..109107f 100644
--- a/cells/o211ai/sky130_fd_sc_ms__o211ai_1.cdl
+++ b/cells/o211ai/sky130_fd_sc_ms__o211ai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__o211ai_1 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o211ai_1
diff --git a/cells/o211ai/sky130_fd_sc_ms__o211ai_1.netlist.tsv b/cells/o211ai/sky130_fd_sc_ms__o211ai_1.netlist.tsv
index db45676..22b2479 100644
--- a/cells/o211ai/sky130_fd_sc_ms__o211ai_1.netlist.tsv
+++ b/cells/o211ai/sky130_fd_sc_ms__o211ai_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__o211ai_1	A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211ai/sky130_fd_sc_ms__o211ai_1.spice b/cells/o211ai/sky130_fd_sc_ms__o211ai_1.spice
index 12111a3..6240006 100644
--- a/cells/o211ai/sky130_fd_sc_ms__o211ai_1.spice
+++ b/cells/o211ai/sky130_fd_sc_ms__o211ai_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__o211ai_1 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_31_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.44e+11p pd=4.16e+06u as=2.59e+11p ps=2.18e+06u
-M1001 a_311_74# B1 a_31_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=0p ps=0u
-M1002 Y C1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=9.184e+11p pd=6.12e+06u as=6.72e+11p ps=5.68e+06u
-M1003 VPWR B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_119_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.688e+11p pd=2.72e+06u as=0p ps=0u
-M1005 Y A2 a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A1 a_31_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y C1 a_311_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.588e+11p pd=2.72e+06u as=0p ps=0u
+X0 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_311_74# C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VGND A2 a_31_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_31_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR A1 a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_119_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_31_74# B1 a_311_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/o211ai/sky130_fd_sc_ms__o211ai_2.cdl b/cells/o211ai/sky130_fd_sc_ms__o211ai_2.cdl
index 2b8987d..78e3508 100644
--- a/cells/o211ai/sky130_fd_sc_ms__o211ai_2.cdl
+++ b/cells/o211ai/sky130_fd_sc_ms__o211ai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__o211ai_2 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o211ai_2
diff --git a/cells/o211ai/sky130_fd_sc_ms__o211ai_2.netlist.tsv b/cells/o211ai/sky130_fd_sc_ms__o211ai_2.netlist.tsv
index af4d321..cbb91ba 100644
--- a/cells/o211ai/sky130_fd_sc_ms__o211ai_2.netlist.tsv
+++ b/cells/o211ai/sky130_fd_sc_ms__o211ai_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__o211ai_2	A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211ai/sky130_fd_sc_ms__o211ai_2.spice b/cells/o211ai/sky130_fd_sc_ms__o211ai_2.spice
index 78648e7..a1c285b 100644
--- a/cells/o211ai/sky130_fd_sc_ms__o211ai_2.spice
+++ b/cells/o211ai/sky130_fd_sc_ms__o211ai_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ms__o211ai_2 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_303_84# B1 a_30_84# VNB nlowvt w=740000u l=150000u
-+  ad=7.067e+11p pd=6.35e+06u as=6.882e+11p ps=6.3e+06u
-M1001 a_30_84# C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1002 Y C1 a_30_84# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A2 a_303_84# VNB nlowvt w=740000u l=150000u
-+  ad=6.512e+11p pd=6.2e+06u as=0p ps=0u
-M1004 a_303_84# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_303_84# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A1 a_303_84# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A2 a_505_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=9.072e+11p pd=8.34e+06u as=9.296e+11p ps=8.38e+06u
-M1008 Y C1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=1.288e+12p ps=1.126e+07u
-M1009 VPWR C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_505_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_505_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A1 a_505_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_30_84# B1 a_303_84# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_505_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_303_84# B1 a_30_84# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_30_84# C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 Y A2 a_505_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_30_84# B1 a_303_84# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_303_84# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 Y C1 a_30_84# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_505_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_505_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_303_84# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VGND A2 a_303_84# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 VGND A1 a_303_84# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o211ai/sky130_fd_sc_ms__o211ai_4.cdl b/cells/o211ai/sky130_fd_sc_ms__o211ai_4.cdl
index 915ba23..09ab4d6 100644
--- a/cells/o211ai/sky130_fd_sc_ms__o211ai_4.cdl
+++ b/cells/o211ai/sky130_fd_sc_ms__o211ai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__o211ai_4 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o211ai_4
diff --git a/cells/o211ai/sky130_fd_sc_ms__o211ai_4.netlist.tsv b/cells/o211ai/sky130_fd_sc_ms__o211ai_4.netlist.tsv
index 233581d..ed2bb64 100644
--- a/cells/o211ai/sky130_fd_sc_ms__o211ai_4.netlist.tsv
+++ b/cells/o211ai/sky130_fd_sc_ms__o211ai_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__o211ai_4	A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211ai/sky130_fd_sc_ms__o211ai_4.spice b/cells/o211ai/sky130_fd_sc_ms__o211ai_4.spice
index a44d45b..8bb5094 100644
--- a/cells/o211ai/sky130_fd_sc_ms__o211ai_4.spice
+++ b/cells/o211ai/sky130_fd_sc_ms__o211ai_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__o211ai_4 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 Y C1 a_834_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=1.0434e+12p ps=1.022e+07u
-M1001 Y C1 a_834_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.3664e+12p pd=1.14e+07u as=2.24e+12p ps=1.52e+07u
-M1003 VGND A2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=9.472e+11p pd=8.48e+06u as=1.4578e+12p ps=1.43e+07u
-M1004 Y C1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_834_74# B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# B1 a_834_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_30_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.6464e+12p pd=1.414e+07u as=0p ps=0u
-M1012 VPWR A1 a_30_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A1 a_30_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_834_74# C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A2 a_30_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_834_74# C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_30_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_834_74# B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_30_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_74# B1 a_834_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A2 a_30_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_30_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_30_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_30_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_30_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 Y A2 a_30_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_834_74# B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 Y A2 a_30_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 VPWR A1 a_30_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_27_74# B1 a_834_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 Y C1 a_834_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VPWR A1 a_30_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_834_74# B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_834_74# C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_27_74# B1 a_834_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 Y C1 a_834_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_834_74# C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_30_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o21a/sky130_fd_sc_ms__o21a_1.cdl b/cells/o21a/sky130_fd_sc_ms__o21a_1.cdl
index d0ede24..8fdd810 100644
--- a/cells/o21a/sky130_fd_sc_ms__o21a_1.cdl
+++ b/cells/o21a/sky130_fd_sc_ms__o21a_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__o21a_1 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o21a_1
diff --git a/cells/o21a/sky130_fd_sc_ms__o21a_1.netlist.tsv b/cells/o21a/sky130_fd_sc_ms__o21a_1.netlist.tsv
index 4a15314..5caf7c2 100644
--- a/cells/o21a/sky130_fd_sc_ms__o21a_1.netlist.tsv
+++ b/cells/o21a/sky130_fd_sc_ms__o21a_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__o21a_1	A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21a/sky130_fd_sc_ms__o21a_1.spice b/cells/o21a/sky130_fd_sc_ms__o21a_1.spice
index 1c94f99..73ca43b 100644
--- a/cells/o21a/sky130_fd_sc_ms__o21a_1.spice
+++ b/cells/o21a/sky130_fd_sc_ms__o21a_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__o21a_1 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 a_83_244# B1 VPWR VPB pshort w=840000u l=180000u
-+  ad=3.13e+11p pd=2.65e+06u as=9.2025e+11p ps=6.03e+06u
-M1001 a_320_74# A1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=3.616e+11p pd=3.69e+06u as=3.901e+11p ps=3.89e+06u
-M1002 a_320_74# B1 a_83_244# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1003 VPWR a_83_244# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1004 VPWR A1 a_379_387# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.9e+11p ps=2.78e+06u
-M1005 VGND a_83_244# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1006 VGND A2 a_320_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_379_387# A2 a_83_244# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_320_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 a_83_244# B1 a_320_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 VGND A1 a_320_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 X a_83_244# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR B1 a_83_244# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 a_83_244# A2 a_379_387# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_379_387# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 X a_83_244# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o21a/sky130_fd_sc_ms__o21a_2.cdl b/cells/o21a/sky130_fd_sc_ms__o21a_2.cdl
index 62c26a7..5fedb8e 100644
--- a/cells/o21a/sky130_fd_sc_ms__o21a_2.cdl
+++ b/cells/o21a/sky130_fd_sc_ms__o21a_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__o21a_2 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o21a_2
diff --git a/cells/o21a/sky130_fd_sc_ms__o21a_2.netlist.tsv b/cells/o21a/sky130_fd_sc_ms__o21a_2.netlist.tsv
index ef6844f..d64eae3 100644
--- a/cells/o21a/sky130_fd_sc_ms__o21a_2.netlist.tsv
+++ b/cells/o21a/sky130_fd_sc_ms__o21a_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__o21a_2	A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21a/sky130_fd_sc_ms__o21a_2.spice b/cells/o21a/sky130_fd_sc_ms__o21a_2.spice
index 3bb04d6..31aa360 100644
--- a/cells/o21a/sky130_fd_sc_ms__o21a_2.spice
+++ b/cells/o21a/sky130_fd_sc_ms__o21a_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__o21a_2 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 VPWR B1 a_247_368# VPB pshort w=1e+06u l=180000u
-+  ad=1.204e+12p pd=8.72e+06u as=3.9e+11p ps=2.78e+06u
-M1001 a_247_368# A2 a_163_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1002 X a_247_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1003 X a_247_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=8.14e+11p ps=6.64e+06u
-M1004 VPWR a_247_368# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_54_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=5.032e+11p pd=4.32e+06u as=0p ps=0u
-M1006 VGND A1 a_54_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_247_368# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_163_368# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_247_368# B1 a_54_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.627e+11p pd=2.19e+06u as=0p ps=0u
+X0 VPWR A1 a_163_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VPWR a_247_368# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VGND a_247_368# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_54_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_54_74# B1 a_247_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 X a_247_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 X a_247_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_163_368# A2 a_247_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_247_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 VGND A2 a_54_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o21a/sky130_fd_sc_ms__o21a_4.cdl b/cells/o21a/sky130_fd_sc_ms__o21a_4.cdl
index ddb58e7..8296b72 100644
--- a/cells/o21a/sky130_fd_sc_ms__o21a_4.cdl
+++ b/cells/o21a/sky130_fd_sc_ms__o21a_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__o21a_4 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o21a_4
diff --git a/cells/o21a/sky130_fd_sc_ms__o21a_4.netlist.tsv b/cells/o21a/sky130_fd_sc_ms__o21a_4.netlist.tsv
index 57a3e6b..c9069f5 100644
--- a/cells/o21a/sky130_fd_sc_ms__o21a_4.netlist.tsv
+++ b/cells/o21a/sky130_fd_sc_ms__o21a_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__o21a_4	A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21a/sky130_fd_sc_ms__o21a_4.spice b/cells/o21a/sky130_fd_sc_ms__o21a_4.spice
index e68a148..0e78c5a 100644
--- a/cells/o21a/sky130_fd_sc_ms__o21a_4.spice
+++ b/cells/o21a/sky130_fd_sc_ms__o21a_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__o21a_4 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 a_219_387# B1 VPWR VPB pshort w=840000u l=180000u
-+  ad=5.64e+11p pd=4.92e+06u as=1.9384e+12p ps=1.45e+07u
-M1001 VGND a_219_387# X VNB nlowvt w=740000u l=150000u
-+  ad=1.1573e+12p pd=1.034e+07u as=4.144e+11p ps=4.08e+06u
-M1002 X a_219_387# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_125# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=7.744e+11p pd=7.54e+06u as=0p ps=0u
-M1004 VGND A2 a_27_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_219_387# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_219_387# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_219_387# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1008 VPWR B1 a_219_387# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_219_387# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_125# B1 a_219_387# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1011 a_219_387# A2 a_119_387# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=6.4e+11p ps=5.28e+06u
-M1012 VPWR a_219_387# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_119_387# A2 a_219_387# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A1 a_119_387# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A1 a_27_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_119_387# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_219_387# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_125# A1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_219_387# B1 a_27_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_219_387# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_27_125# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 VPWR a_219_387# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 X a_219_387# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 X a_219_387# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 X a_219_387# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 X a_219_387# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_219_387# A2 a_119_387# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 VGND A1 a_27_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 VGND a_219_387# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VPWR A1 a_119_387# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_119_387# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 a_219_387# B1 a_27_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 a_27_125# B1 a_219_387# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 a_27_125# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 VPWR a_219_387# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VGND A2 a_27_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 a_119_387# A2 a_219_387# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 VPWR B1 a_219_387# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X19 a_219_387# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
 .ends
diff --git a/cells/o21ai/sky130_fd_sc_ms__o21ai_1.cdl b/cells/o21ai/sky130_fd_sc_ms__o21ai_1.cdl
index 4e84c70..b40a1df 100644
--- a/cells/o21ai/sky130_fd_sc_ms__o21ai_1.cdl
+++ b/cells/o21ai/sky130_fd_sc_ms__o21ai_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__o21ai_1 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o21ai_1
diff --git a/cells/o21ai/sky130_fd_sc_ms__o21ai_1.netlist.tsv b/cells/o21ai/sky130_fd_sc_ms__o21ai_1.netlist.tsv
index 2b738ee..023abd0 100644
--- a/cells/o21ai/sky130_fd_sc_ms__o21ai_1.netlist.tsv
+++ b/cells/o21ai/sky130_fd_sc_ms__o21ai_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__o21ai_1	A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ai/sky130_fd_sc_ms__o21ai_1.spice b/cells/o21ai/sky130_fd_sc_ms__o21ai_1.spice
index 03647dd..1eb1628 100644
--- a/cells/o21ai/sky130_fd_sc_ms__o21ai_1.spice
+++ b/cells/o21ai/sky130_fd_sc_ms__o21ai_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ms__o21ai_1 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.181e+11p pd=4.09e+06u as=6.722e+11p ps=3.36e+06u
-M1001 a_165_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.688e+11p pd=2.72e+06u as=7.616e+11p ps=5.84e+06u
-M1002 VPWR B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=5.32e+11p ps=3.19e+06u
-M1003 Y B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.627e+11p pd=2.19e+06u as=0p ps=0u
-M1004 Y A2 a_165_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_165_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR A1 a_165_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o21ai/sky130_fd_sc_ms__o21ai_2.cdl b/cells/o21ai/sky130_fd_sc_ms__o21ai_2.cdl
index bb39159..b8cb88f 100644
--- a/cells/o21ai/sky130_fd_sc_ms__o21ai_2.cdl
+++ b/cells/o21ai/sky130_fd_sc_ms__o21ai_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__o21ai_2 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o21ai_2
diff --git a/cells/o21ai/sky130_fd_sc_ms__o21ai_2.netlist.tsv b/cells/o21ai/sky130_fd_sc_ms__o21ai_2.netlist.tsv
index a4e46d4..9be214a 100644
--- a/cells/o21ai/sky130_fd_sc_ms__o21ai_2.netlist.tsv
+++ b/cells/o21ai/sky130_fd_sc_ms__o21ai_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__o21ai_2	A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ai/sky130_fd_sc_ms__o21ai_2.spice b/cells/o21ai/sky130_fd_sc_ms__o21ai_2.spice
index d4238c6..086c50b 100644
--- a/cells/o21ai/sky130_fd_sc_ms__o21ai_2.spice
+++ b/cells/o21ai/sky130_fd_sc_ms__o21ai_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__o21ai_2 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=9.296e+11p pd=8.38e+06u as=6.608e+11p ps=5.66e+06u
-M1001 a_119_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=6.608e+11p ps=5.66e+06u
-M1002 a_119_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A2 a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.331e+11p pd=2.11e+06u as=8.806e+11p ps=8.3e+06u
-M1006 VPWR B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=5.069e+11p ps=4.33e+06u
-M1008 a_27_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_119_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 Y A2 a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR A1 a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_119_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o21ai/sky130_fd_sc_ms__o21ai_4.cdl b/cells/o21ai/sky130_fd_sc_ms__o21ai_4.cdl
index b282c0b..5f75b33 100644
--- a/cells/o21ai/sky130_fd_sc_ms__o21ai_4.cdl
+++ b/cells/o21ai/sky130_fd_sc_ms__o21ai_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__o21ai_4 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o21ai_4
diff --git a/cells/o21ai/sky130_fd_sc_ms__o21ai_4.netlist.tsv b/cells/o21ai/sky130_fd_sc_ms__o21ai_4.netlist.tsv
index 17d49e7..84999db 100644
--- a/cells/o21ai/sky130_fd_sc_ms__o21ai_4.netlist.tsv
+++ b/cells/o21ai/sky130_fd_sc_ms__o21ai_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__o21ai_4	A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ai/sky130_fd_sc_ms__o21ai_4.spice b/cells/o21ai/sky130_fd_sc_ms__o21ai_4.spice
index 92001b0..c7d17cb 100644
--- a/cells/o21ai/sky130_fd_sc_ms__o21ai_4.spice
+++ b/cells/o21ai/sky130_fd_sc_ms__o21ai_4.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ms__o21ai_4 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 VGND A2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=8.399e+11p pd=8.19e+06u as=1.4763e+12p ps=1.435e+07u
-M1001 VGND A2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1003 Y B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_119_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.5344e+12p pd=1.394e+07u as=1.3272e+12p ps=1.133e+07u
-M1005 VPWR A1 a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_119_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A1 a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=9.632e+11p pd=8.44e+06u as=0p ps=0u
-M1012 VPWR B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_119_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A2 a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A2 a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_119_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_119_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 Y A2 a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_119_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_119_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_119_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 Y A2 a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 VPWR A1 a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VPWR A1 a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o21ba/sky130_fd_sc_ms__o21ba_1.cdl b/cells/o21ba/sky130_fd_sc_ms__o21ba_1.cdl
index 8a75556..6fbe463 100644
--- a/cells/o21ba/sky130_fd_sc_ms__o21ba_1.cdl
+++ b/cells/o21ba/sky130_fd_sc_ms__o21ba_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o21ba_1 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPB1N B1 B1_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 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 pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o21ba_1
diff --git a/cells/o21ba/sky130_fd_sc_ms__o21ba_1.netlist.tsv b/cells/o21ba/sky130_fd_sc_ms__o21ba_1.netlist.tsv
index 4c67bf3..c7ef0be 100644
--- a/cells/o21ba/sky130_fd_sc_ms__o21ba_1.netlist.tsv
+++ b/cells/o21ba/sky130_fd_sc_ms__o21ba_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o21ba_1	A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	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	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ba/sky130_fd_sc_ms__o21ba_1.spice b/cells/o21ba/sky130_fd_sc_ms__o21ba_1.spice
index e8ca27c..46e4722 100644
--- a/cells/o21ba/sky130_fd_sc_ms__o21ba_1.spice
+++ b/cells/o21ba/sky130_fd_sc_ms__o21ba_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__o21ba_1 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 X a_203_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=9.926e+11p ps=8.17e+06u
-M1001 X a_203_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=5.587e+11p ps=4.44e+06u
-M1002 a_119_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1003 a_203_392# A2 a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=3.9e+11p pd=2.78e+06u as=0p ps=0u
-M1004 VPWR a_281_244# a_203_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_203_392# a_281_244# a_27_74# VNB nlowvt w=640000u l=150000u
-+  ad=2.176e+11p pd=1.96e+06u as=3.712e+11p ps=3.72e+06u
-M1006 VGND B1_N a_281_244# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.1e+06u
-M1007 VPWR B1_N a_281_244# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.982e+11p ps=2.39e+06u
-M1008 VGND A1 a_27_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_74# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_119_392# A2 a_203_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VPWR a_203_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_27_74# a_281_244# a_203_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_281_244# B1_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 VGND a_203_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_203_392# a_281_244# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VPWR A1 a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_281_244# B1_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
 .ends
diff --git a/cells/o21ba/sky130_fd_sc_ms__o21ba_2.cdl b/cells/o21ba/sky130_fd_sc_ms__o21ba_2.cdl
index 4972eb6..7318d23 100644
--- a/cells/o21ba/sky130_fd_sc_ms__o21ba_2.cdl
+++ b/cells/o21ba/sky130_fd_sc_ms__o21ba_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o21ba_2 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPB1N B1 B1_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o21ba_2
diff --git a/cells/o21ba/sky130_fd_sc_ms__o21ba_2.netlist.tsv b/cells/o21ba/sky130_fd_sc_ms__o21ba_2.netlist.tsv
index 97c35a1..bf1fd89 100644
--- a/cells/o21ba/sky130_fd_sc_ms__o21ba_2.netlist.tsv
+++ b/cells/o21ba/sky130_fd_sc_ms__o21ba_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o21ba_2	A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	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	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ba/sky130_fd_sc_ms__o21ba_2.spice b/cells/o21ba/sky130_fd_sc_ms__o21ba_2.spice
index 3cbb0df..2e88632 100644
--- a/cells/o21ba/sky130_fd_sc_ms__o21ba_2.spice
+++ b/cells/o21ba/sky130_fd_sc_ms__o21ba_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__o21ba_2 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 a_585_368# A2 a_177_48# VPB pshort w=1e+06u l=180000u
-+  ad=3.3e+11p pd=2.66e+06u as=2.7e+11p ps=2.54e+06u
-M1001 VGND a_177_48# X VNB nlowvt w=740000u l=150000u
-+  ad=7.8915e+11p pd=6.84e+06u as=2.072e+11p ps=2.04e+06u
-M1002 VPWR B1_N a_27_74# VPB pshort w=840000u l=180000u
-+  ad=1.4348e+12p pd=9.16e+06u as=2.352e+11p ps=2.24e+06u
-M1003 VGND A2 a_487_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.07e+11p ps=4.06e+06u
-M1004 X a_177_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1005 VPWR a_177_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND B1_N a_27_74# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5125e+11p ps=1.65e+06u
-M1007 X a_177_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_487_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_585_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_177_48# a_27_74# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_487_74# a_27_74# a_177_48# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.035e+11p ps=2.03e+06u
+X0 VGND A1 a_487_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_27_74# B1_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X2 X a_177_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_585_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VPWR a_27_74# a_177_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 VGND a_177_48# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_27_74# B1_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 X a_177_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_177_48# a_27_74# a_487_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR a_177_48# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_487_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_177_48# A2 a_585_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/o21ba/sky130_fd_sc_ms__o21ba_4.cdl b/cells/o21ba/sky130_fd_sc_ms__o21ba_4.cdl
index abe1f84..fa4bc9a 100644
--- a/cells/o21ba/sky130_fd_sc_ms__o21ba_4.cdl
+++ b/cells/o21ba/sky130_fd_sc_ms__o21ba_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o21ba_4 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPB1N B1 B1_N VPB pfet_01v8 m=1 w=1.12 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 m=4 w=1.12 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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o21ba_4
diff --git a/cells/o21ba/sky130_fd_sc_ms__o21ba_4.netlist.tsv b/cells/o21ba/sky130_fd_sc_ms__o21ba_4.netlist.tsv
index c3ccc61..4a4925b 100644
--- a/cells/o21ba/sky130_fd_sc_ms__o21ba_4.netlist.tsv
+++ b/cells/o21ba/sky130_fd_sc_ms__o21ba_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o21ba_4	A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ba/sky130_fd_sc_ms__o21ba_4.spice b/cells/o21ba/sky130_fd_sc_ms__o21ba_4.spice
index 64f9e96..034712e 100644
--- a/cells/o21ba/sky130_fd_sc_ms__o21ba_4.spice
+++ b/cells/o21ba/sky130_fd_sc_ms__o21ba_4.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ms__o21ba_4 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 VPWR A1 a_895_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.0896e+12p pd=1.49e+07u as=5.4e+11p ps=5.08e+06u
-M1001 X a_193_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1002 VPWR a_193_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_193_48# X VNB nlowvt w=740000u l=150000u
-+  ad=1.0914e+12p pd=1.012e+07u as=4.218e+11p ps=4.1e+06u
-M1004 VGND A2 a_618_94# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=7.9445e+11p ps=7.84e+06u
-M1005 VGND a_193_48# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_618_94# A1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_193_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_193_48# a_27_368# a_618_94# VNB nlowvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1009 a_618_94# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR B1_N a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1011 VPWR a_193_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A1 a_618_94# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_193_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_895_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_618_94# a_27_368# a_193_48# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_193_48# A2 a_895_392# VPB pshort w=1e+06u l=180000u
-+  ad=4.968e+11p pd=4.76e+06u as=0p ps=0u
-M1017 a_193_48# a_27_368# VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_193_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_27_368# a_193_48# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND B1_N a_27_368# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1021 a_895_392# A2 a_193_48# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_193_48# a_27_368# a_618_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 a_895_392# A2 a_193_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 X a_193_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 X a_193_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 X a_193_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_193_48# A2 a_895_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_193_48# a_27_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 VPWR a_193_48# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VPWR A1 a_895_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 a_27_368# B1_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_27_368# B1_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_618_94# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 VPWR a_193_48# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_895_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 a_618_94# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 a_618_94# a_27_368# a_193_48# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X16 VGND a_193_48# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 VGND A1 a_618_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X18 VPWR a_27_368# a_193_48# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X19 VGND a_193_48# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 X a_193_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 VGND A2 a_618_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/o21bai/sky130_fd_sc_ms__o21bai_1.cdl b/cells/o21bai/sky130_fd_sc_ms__o21bai_1.cdl
index 4a4b6d3..d57fa62 100644
--- a/cells/o21bai/sky130_fd_sc_ms__o21bai_1.cdl
+++ b/cells/o21bai/sky130_fd_sc_ms__o21bai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__o21bai_1 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPB1N B1 B1_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o21bai_1
diff --git a/cells/o21bai/sky130_fd_sc_ms__o21bai_1.netlist.tsv b/cells/o21bai/sky130_fd_sc_ms__o21bai_1.netlist.tsv
index f21fffc..b6707b0 100644
--- a/cells/o21bai/sky130_fd_sc_ms__o21bai_1.netlist.tsv
+++ b/cells/o21bai/sky130_fd_sc_ms__o21bai_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__o21bai_1	A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21bai/sky130_fd_sc_ms__o21bai_1.spice b/cells/o21bai/sky130_fd_sc_ms__o21bai_1.spice
index a2c366f..b697d33 100644
--- a/cells/o21bai/sky130_fd_sc_ms__o21bai_1.spice
+++ b/cells/o21bai/sky130_fd_sc_ms__o21bai_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__o21bai_1 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_398_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.0038e+12p pd=6.52e+06u as=3.36e+11p ps=2.84e+06u
-M1001 VGND B1_N a_27_74# VNB nlowvt w=550000u l=150000u
-+  ad=3.6585e+11p pd=3.71e+06u as=1.54e+11p ps=1.66e+06u
-M1002 a_308_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.551e+11p pd=4.19e+06u as=0p ps=0u
-M1003 a_308_74# a_27_74# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1004 VGND A2 a_308_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR B1_N a_27_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1006 Y a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1007 a_398_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# B1_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X1 Y A2 a_398_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VGND A1 a_308_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_308_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_398_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VPWR a_27_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_27_74# B1_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 Y a_27_74# a_308_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o21bai/sky130_fd_sc_ms__o21bai_2.cdl b/cells/o21bai/sky130_fd_sc_ms__o21bai_2.cdl
index 485e0e8..29a98ed 100644
--- a/cells/o21bai/sky130_fd_sc_ms__o21bai_2.cdl
+++ b/cells/o21bai/sky130_fd_sc_ms__o21bai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__o21bai_2 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPB1N B1 B1_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8_lvt m=1 w=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_ms__o21bai_2
diff --git a/cells/o21bai/sky130_fd_sc_ms__o21bai_2.netlist.tsv b/cells/o21bai/sky130_fd_sc_ms__o21bai_2.netlist.tsv
index 459e64d..8144a32 100644
--- a/cells/o21bai/sky130_fd_sc_ms__o21bai_2.netlist.tsv
+++ b/cells/o21bai/sky130_fd_sc_ms__o21bai_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__o21bai_2	A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21bai/sky130_fd_sc_ms__o21bai_2.spice b/cells/o21bai/sky130_fd_sc_ms__o21bai_2.spice
index 1498b8c..d431c4e 100644
--- a/cells/o21bai/sky130_fd_sc_ms__o21bai_2.spice
+++ b/cells/o21bai/sky130_fd_sc_ms__o21bai_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__o21bai_2 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 VPWR B1_N a_27_74# VPB pshort w=1e+06u l=180000u
-+  ad=1.3578e+12p pd=9.18e+06u as=2.9e+11p ps=2.58e+06u
-M1001 a_510_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.104e+11p pd=5.57e+06u as=0p ps=0u
-M1002 Y A2 a_510_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1003 a_510_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_225_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=8.88e+11p pd=8.32e+06u as=6.708e+11p ps=6.13e+06u
-M1005 a_225_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A1 a_225_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_225_74# a_27_74# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1008 Y a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_27_74# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A2 a_225_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B1_N a_27_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1012 VPWR A1 a_510_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y a_27_74# a_225_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# B1_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_510_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_225_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_510_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 Y a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_225_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR A1 a_510_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y a_27_74# a_225_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 Y A2 a_510_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_225_74# a_27_74# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND A2 a_225_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VPWR a_27_74# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_27_74# B1_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 VGND A1 a_225_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o21bai/sky130_fd_sc_ms__o21bai_4.cdl b/cells/o21bai/sky130_fd_sc_ms__o21bai_4.cdl
index 157361d..4af33e7 100644
--- a/cells/o21bai/sky130_fd_sc_ms__o21bai_4.cdl
+++ b/cells/o21bai/sky130_fd_sc_ms__o21bai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__o21bai_4 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPB1N B1 B1_N VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o21bai_4
diff --git a/cells/o21bai/sky130_fd_sc_ms__o21bai_4.netlist.tsv b/cells/o21bai/sky130_fd_sc_ms__o21bai_4.netlist.tsv
index c6ccad0..37249aa 100644
--- a/cells/o21bai/sky130_fd_sc_ms__o21bai_4.netlist.tsv
+++ b/cells/o21bai/sky130_fd_sc_ms__o21bai_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__o21bai_4	A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21bai/sky130_fd_sc_ms__o21bai_4.spice b/cells/o21bai/sky130_fd_sc_ms__o21bai_4.spice
index b1eaeb3..19b7fe9 100644
--- a/cells/o21bai/sky130_fd_sc_ms__o21bai_4.spice
+++ b/cells/o21bai/sky130_fd_sc_ms__o21bai_4.spice
@@ -16,54 +16,29 @@
 
 
 .subckt sky130_fd_sc_ms__o21bai_4 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 Y a_828_48# a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.662e+11p pd=4.22e+06u as=1.6132e+12p ps=1.472e+07u
-M1001 a_27_74# a_828_48# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR A1 a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.3944e+12p pd=1.285e+07u as=1.5904e+12p ps=1.404e+07u
-M1003 a_28_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A1 a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.2473e+12p ps=1.099e+07u
-M1006 Y a_828_48# a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_28_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B1_N a_828_48# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1011 Y A2 a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.288e+12p pd=1.126e+07u as=0p ps=0u
-M1012 Y a_828_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_828_48# B1_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1014 a_28_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR B1_N a_828_48# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_28_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A2 a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_74# a_828_48# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_828_48# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR A1 a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_828_48# B1_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 Y A2 a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR a_828_48# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_28_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_27_74# a_828_48# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 Y a_828_48# a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_828_48# B1_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_28_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VPWR B1_N a_828_48# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X15 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 Y a_828_48# a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_28_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 Y a_828_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_28_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 a_27_74# a_828_48# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 Y A2 a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o221a/sky130_fd_sc_ms__o221a_1.cdl b/cells/o221a/sky130_fd_sc_ms__o221a_1.cdl
index 8daf677..198c6d3 100644
--- a/cells/o221a/sky130_fd_sc_ms__o221a_1.cdl
+++ b/cells/o221a/sky130_fd_sc_ms__o221a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__o221a_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 sndB1 B2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 pndB B2 VNB nfet_01v8_lvt m=1 w=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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o221a_1
diff --git a/cells/o221a/sky130_fd_sc_ms__o221a_1.netlist.tsv b/cells/o221a/sky130_fd_sc_ms__o221a_1.netlist.tsv
index e80009c..5f7261a 100644
--- a/cells/o221a/sky130_fd_sc_ms__o221a_1.netlist.tsv
+++ b/cells/o221a/sky130_fd_sc_ms__o221a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__o221a_1	A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8	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	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221a/sky130_fd_sc_ms__o221a_1.spice b/cells/o221a/sky130_fd_sc_ms__o221a_1.spice
index 8bdf590..6d8ed2d 100644
--- a/cells/o221a/sky130_fd_sc_ms__o221a_1.spice
+++ b/cells/o221a/sky130_fd_sc_ms__o221a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__o221a_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 VGND A2 a_245_94# VNB nlowvt w=640000u l=150000u
-+  ad=4.931e+11p pd=4.19e+06u as=4.032e+11p ps=3.82e+06u
-M1001 a_245_94# B2 a_456_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=4.576e+11p ps=3.99e+06u
-M1002 a_83_264# A2 a_267_392# VPB pshort w=1e+06u l=180000u
-+  ad=6.7e+11p pd=5.34e+06u as=2.4e+11p ps=2.48e+06u
-M1003 a_245_94# A1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_83_264# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1005 VPWR B1 a_465_392# VPB pshort w=1e+06u l=180000u
-+  ad=1.42e+12p pd=7.02e+06u as=3.9e+11p ps=2.78e+06u
-M1006 a_83_264# C1 a_456_74# VNB nlowvt w=640000u l=150000u
-+  ad=2.944e+11p pd=2.2e+06u as=0p ps=0u
-M1007 VPWR a_83_264# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1008 a_456_74# B1 a_245_94# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_83_264# C1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_267_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_465_392# B2 a_83_264# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_245_94# B1 a_456_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 a_245_94# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_465_392# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 X a_83_264# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR A1 a_267_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 VPWR C1 a_83_264# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 VGND A1 a_245_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X7 a_267_392# A2 a_83_264# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 X a_83_264# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_83_264# B2 a_465_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_456_74# B2 a_245_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 a_456_74# C1 a_83_264# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/o221a/sky130_fd_sc_ms__o221a_2.cdl b/cells/o221a/sky130_fd_sc_ms__o221a_2.cdl
index 56418fb..f69bbc1 100644
--- a/cells/o221a/sky130_fd_sc_ms__o221a_2.cdl
+++ b/cells/o221a/sky130_fd_sc_ms__o221a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__o221a_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 sndB1 B2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 pndB B2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o221a_2
diff --git a/cells/o221a/sky130_fd_sc_ms__o221a_2.netlist.tsv b/cells/o221a/sky130_fd_sc_ms__o221a_2.netlist.tsv
index af8a213..fd7d1fd 100644
--- a/cells/o221a/sky130_fd_sc_ms__o221a_2.netlist.tsv
+++ b/cells/o221a/sky130_fd_sc_ms__o221a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__o221a_2	A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221a/sky130_fd_sc_ms__o221a_2.spice b/cells/o221a/sky130_fd_sc_ms__o221a_2.spice
index f785907..291bacd 100644
--- a/cells/o221a/sky130_fd_sc_ms__o221a_2.spice
+++ b/cells/o221a/sky130_fd_sc_ms__o221a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__o221a_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 VGND a_27_368# X VNB nlowvt w=740000u l=150000u
-+  ad=8.325e+11p pd=6.69e+06u as=2.072e+11p ps=2.04e+06u
-M1001 a_533_368# A2 a_27_368# VPB pshort w=1e+06u l=180000u
-+  ad=3.9e+11p pd=2.78e+06u as=6.7e+11p ps=5.34e+06u
-M1002 a_27_368# B2 a_335_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1003 a_165_74# B2 a_264_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.662e+11p pd=4.22e+06u as=4.699e+11p ps=4.23e+06u
-M1004 VGND A1 a_264_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A1 a_533_368# VPB pshort w=1e+06u l=180000u
-+  ad=1.7732e+12p pd=9.88e+06u as=0p ps=0u
-M1006 VPWR C1 a_27_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_165_74# C1 a_27_368# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1008 X a_27_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_264_74# B1 a_165_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_264_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_335_368# B1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_27_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1013 VPWR a_27_368# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_27_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 X a_27_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_335_368# B2 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 VGND a_27_368# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_165_74# B1 a_264_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_27_368# C1 a_165_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_27_368# A2 a_533_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VPWR a_27_368# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_27_368# C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 a_533_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 VPWR B1 a_335_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_264_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VGND A2 a_264_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_264_74# B2 a_165_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o221a/sky130_fd_sc_ms__o221a_4.cdl b/cells/o221a/sky130_fd_sc_ms__o221a_4.cdl
index e11c394..2eca219 100644
--- a/cells/o221a/sky130_fd_sc_ms__o221a_4.cdl
+++ b/cells/o221a/sky130_fd_sc_ms__o221a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__o221a_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 sndB1 B2 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 pndB B2 VNB nfet_01v8_lvt m=2 w=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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o221a_4
diff --git a/cells/o221a/sky130_fd_sc_ms__o221a_4.netlist.tsv b/cells/o221a/sky130_fd_sc_ms__o221a_4.netlist.tsv
index 5248ee1..8ceda76 100644
--- a/cells/o221a/sky130_fd_sc_ms__o221a_4.netlist.tsv
+++ b/cells/o221a/sky130_fd_sc_ms__o221a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__o221a_4	A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221a/sky130_fd_sc_ms__o221a_4.spice b/cells/o221a/sky130_fd_sc_ms__o221a_4.spice
index 5a1a37b..1812baf 100644
--- a/cells/o221a/sky130_fd_sc_ms__o221a_4.spice
+++ b/cells/o221a/sky130_fd_sc_ms__o221a_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__o221a_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 X a_114_125# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=7.504e+11p pd=5.82e+06u as=2.281e+12p ps=1.709e+07u
-M1001 a_27_125# B1 a_300_125# VNB nlowvt w=640000u l=150000u
-+  ad=7.904e+11p pd=7.59e+06u as=7.456e+11p ps=7.45e+06u
-M1002 VGND a_114_125# X VNB nlowvt w=740000u l=150000u
-+  ad=1.2421e+12p pd=1.053e+07u as=4.181e+11p ps=4.09e+06u
-M1003 X a_114_125# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_300_125# B2 a_27_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_114_125# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A1 a_300_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_114_125# A2 a_766_387# VPB pshort w=1e+06u l=180000u
-+  ad=8.35e+11p pd=7.67e+06u as=6.15e+11p ps=5.23e+06u
-M1008 a_300_387# B1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.85e+11p pd=5.17e+06u as=0p ps=0u
-M1009 VGND A2 a_300_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_300_125# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_300_125# B1 a_27_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_125# C1 a_114_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1013 a_766_387# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_114_125# C1 a_27_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_114_125# C1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR C1 a_114_125# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_766_387# A2 a_114_125# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_300_125# A1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_114_125# B2 a_300_387# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_114_125# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_300_387# B2 a_114_125# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_114_125# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR B1 a_300_387# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR A1 a_766_387# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_27_125# B2 a_300_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_114_125# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_114_125# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_300_387# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_300_125# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_27_125# B1 a_300_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_114_125# A2 a_766_387# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_300_125# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 X a_114_125# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 X a_114_125# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_114_125# C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_27_125# B2 a_300_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 VPWR A1 a_766_387# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 VGND A2 a_300_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 VGND a_114_125# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_114_125# B2 a_300_387# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 VPWR C1 a_114_125# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 VPWR B1 a_300_387# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X15 a_300_125# B1 a_27_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X16 a_300_125# B2 a_27_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 VPWR a_114_125# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 X a_114_125# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_27_125# C1 a_114_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X20 X a_114_125# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 VGND A1 a_300_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X22 VGND a_114_125# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_766_387# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X24 a_114_125# C1 a_27_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X25 VPWR a_114_125# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 a_300_387# B2 a_114_125# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X27 a_766_387# A2 a_114_125# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/o221ai/sky130_fd_sc_ms__o221ai_1.cdl b/cells/o221ai/sky130_fd_sc_ms__o221ai_1.cdl
index 6565d42..07ed672 100644
--- a/cells/o221ai/sky130_fd_sc_ms__o221ai_1.cdl
+++ b/cells/o221ai/sky130_fd_sc_ms__o221ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o221ai_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 sndB1 B2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 pndB B2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o221ai_1
diff --git a/cells/o221ai/sky130_fd_sc_ms__o221ai_1.netlist.tsv b/cells/o221ai/sky130_fd_sc_ms__o221ai_1.netlist.tsv
index 1cae084..b8b3061 100644
--- a/cells/o221ai/sky130_fd_sc_ms__o221ai_1.netlist.tsv
+++ b/cells/o221ai/sky130_fd_sc_ms__o221ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o221ai_1	A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221ai/sky130_fd_sc_ms__o221ai_1.spice b/cells/o221ai/sky130_fd_sc_ms__o221ai_1.spice
index 6a2ac74..7a8f876 100644
--- a/cells/o221ai/sky130_fd_sc_ms__o221ai_1.spice
+++ b/cells/o221ai/sky130_fd_sc_ms__o221ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__o221ai_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 VGND A2 a_239_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.736e+11p pd=2.76e+06u as=6.808e+11p ps=6.28e+06u
-M1001 a_239_74# B2 a_114_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=5.217e+11p ps=4.37e+06u
-M1002 VPWR C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=1.1312e+12p pd=6.5e+06u as=7.504e+11p ps=5.82e+06u
-M1003 a_114_74# B1 a_239_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_327_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.688e+11p pd=2.72e+06u as=0p ps=0u
-M1005 a_525_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=4.368e+11p pd=3.02e+06u as=0p ps=0u
-M1006 a_239_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B2 a_327_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A1 a_525_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_114_74# C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
+X0 a_114_74# B2 a_239_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VPWR B1 a_327_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_327_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_239_74# B1 a_114_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 Y A2 a_525_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VGND A1 a_239_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_525_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_239_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 Y C1 a_114_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o221ai/sky130_fd_sc_ms__o221ai_2.cdl b/cells/o221ai/sky130_fd_sc_ms__o221ai_2.cdl
index cd6c379..8895e29 100644
--- a/cells/o221ai/sky130_fd_sc_ms__o221ai_2.cdl
+++ b/cells/o221ai/sky130_fd_sc_ms__o221ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o221ai_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 sndB1 B2 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 pndB B2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o221ai_2
diff --git a/cells/o221ai/sky130_fd_sc_ms__o221ai_2.netlist.tsv b/cells/o221ai/sky130_fd_sc_ms__o221ai_2.netlist.tsv
index a47fdce..dee90d7 100644
--- a/cells/o221ai/sky130_fd_sc_ms__o221ai_2.netlist.tsv
+++ b/cells/o221ai/sky130_fd_sc_ms__o221ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o221ai_2	A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221ai/sky130_fd_sc_ms__o221ai_2.spice b/cells/o221ai/sky130_fd_sc_ms__o221ai_2.spice
index dcff7d1..0a81a46 100644
--- a/cells/o221ai/sky130_fd_sc_ms__o221ai_2.spice
+++ b/cells/o221ai/sky130_fd_sc_ms__o221ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__o221ai_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 a_311_85# B2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.0841e+12p pd=1.033e+07u as=9.287e+11p ps=8.43e+06u
-M1001 a_311_85# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=5.328e+11p ps=4.4e+06u
-M1002 Y B2 a_379_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=9.24e+11p pd=8.37e+06u as=7e+11p ps=5.73e+06u
-M1003 VGND A1 a_311_85# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_74# B2 a_311_85# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A2 a_779_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=6.608e+11p ps=5.66e+06u
-M1006 a_779_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=1.8032e+12p ps=1.218e+07u
-M1007 a_779_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_379_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_379_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR B1 a_379_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A2 a_311_85# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_74# B1 a_311_85# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y C1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A1 a_779_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_311_85# B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y C1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1018 a_27_74# C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_311_85# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A2 a_779_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_311_85# B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Y C1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_311_85# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_779_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 Y B2 a_379_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_27_74# B1 a_311_85# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_379_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VPWR A1 a_779_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_27_74# B2 a_311_85# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_311_85# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_379_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VPWR B1 a_379_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VGND A2 a_311_85# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_779_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_311_85# B2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_27_74# C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 VGND A1 a_311_85# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o221ai/sky130_fd_sc_ms__o221ai_4.cdl b/cells/o221ai/sky130_fd_sc_ms__o221ai_4.cdl
index a7d58a0..a17fd95 100644
--- a/cells/o221ai/sky130_fd_sc_ms__o221ai_4.cdl
+++ b/cells/o221ai/sky130_fd_sc_ms__o221ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o221ai_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 sndB1 B2 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 pndB B2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o221ai_4
diff --git a/cells/o221ai/sky130_fd_sc_ms__o221ai_4.netlist.tsv b/cells/o221ai/sky130_fd_sc_ms__o221ai_4.netlist.tsv
index faa6e1d..bea8087 100644
--- a/cells/o221ai/sky130_fd_sc_ms__o221ai_4.netlist.tsv
+++ b/cells/o221ai/sky130_fd_sc_ms__o221ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o221ai_4	A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221ai/sky130_fd_sc_ms__o221ai_4.spice b/cells/o221ai/sky130_fd_sc_ms__o221ai_4.spice
index 12e983c..282c82d 100644
--- a/cells/o221ai/sky130_fd_sc_ms__o221ai_4.spice
+++ b/cells/o221ai/sky130_fd_sc_ms__o221ai_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ms__o221ai_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 a_27_84# C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=1.4578e+12p pd=1.43e+07u as=4.144e+11p ps=4.08e+06u
-M1001 a_1291_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2712e+12p pd=1.123e+07u as=2.5144e+12p ps=2.017e+07u
-M1002 a_27_84# C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR B1 a_511_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=1.2656e+12p ps=1.122e+07u
-M1004 Y C1 a_27_84# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_511_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=1.8984e+12p ps=1.683e+07u
-M1006 a_483_74# B2 a_27_84# VNB nlowvt w=740000u l=150000u
-+  ad=1.9758e+12p pd=1.866e+07u as=0p ps=0u
-M1007 VGND A2 a_483_74# VNB nlowvt w=740000u l=150000u
-+  ad=9.916e+11p pd=8.6e+06u as=0p ps=0u
-M1008 a_483_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_84# B1 a_483_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1 a_1291_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_84# B1 a_483_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_483_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y C1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_483_74# B2 a_27_84# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_84# B2 a_483_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_483_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y C1 a_27_84# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A2 a_483_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_511_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A2 a_1291_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_511_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1291_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B2 a_511_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_84# B2 a_483_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A1 a_483_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR B1 a_511_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A2 a_1291_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_483_74# B1 a_27_84# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A1 a_483_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_511_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1291_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_483_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 Y C1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y B2 a_511_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_483_74# B1 a_27_84# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1291_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR A1 a_1291_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_511_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VGND A2 a_483_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VGND A2 a_483_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR A1 a_1291_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 Y C1 a_27_84# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_27_84# B1 a_483_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_1291_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_483_74# B1 a_27_84# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_483_74# B2 a_27_84# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 Y B2 a_511_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_483_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_483_74# B1 a_27_84# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VPWR A1 a_1291_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_1291_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_511_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_27_84# B2 a_483_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_1291_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 VPWR B1 a_511_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_511_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 a_511_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_1291_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_27_84# C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 a_483_74# B2 a_27_84# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 a_483_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 a_483_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_27_84# C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X30 VPWR B1 a_511_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X31 Y A2 a_1291_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 Y C1 a_27_84# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 VGND A1 a_483_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 VGND A1 a_483_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X35 Y B2 a_511_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X36 a_27_84# B2 a_483_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X37 a_27_84# B1 a_483_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X38 a_483_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X39 Y A2 a_1291_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/o22a/sky130_fd_sc_ms__o22a_1.cdl b/cells/o22a/sky130_fd_sc_ms__o22a_1.cdl
index ae1757e..e22623a 100644
--- a/cells/o22a/sky130_fd_sc_ms__o22a_1.cdl
+++ b/cells/o22a/sky130_fd_sc_ms__o22a_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o22a_1 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 sndB1 B2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 y B2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o22a_1
diff --git a/cells/o22a/sky130_fd_sc_ms__o22a_1.netlist.tsv b/cells/o22a/sky130_fd_sc_ms__o22a_1.netlist.tsv
index e25908a..817d8d4 100644
--- a/cells/o22a/sky130_fd_sc_ms__o22a_1.netlist.tsv
+++ b/cells/o22a/sky130_fd_sc_ms__o22a_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o22a_1	A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8	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	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22a/sky130_fd_sc_ms__o22a_1.spice b/cells/o22a/sky130_fd_sc_ms__o22a_1.spice
index 284245d..e9fa83b 100644
--- a/cells/o22a/sky130_fd_sc_ms__o22a_1.spice
+++ b/cells/o22a/sky130_fd_sc_ms__o22a_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__o22a_1 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_299_139# A1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=5.3175e+11p pd=5.54e+06u as=5.00375e+11p ps=4.3e+06u
-M1001 VPWR A1 a_575_392# VPB pshort w=1e+06u l=180000u
-+  ad=1.54e+12p pd=7.26e+06u as=3.6e+11p ps=2.72e+06u
-M1002 VPWR a_83_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1003 a_83_260# B1 a_299_139# VNB nlowvt w=640000u l=150000u
-+  ad=2.048e+11p pd=1.92e+06u as=0p ps=0u
-M1004 VGND A2 a_299_139# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_401_392# B1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1006 a_299_139# B2 a_83_260# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_83_260# B2 a_401_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1008 a_575_392# A2 a_83_260# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_83_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
+X0 a_401_392# B2 a_83_260# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VGND A1 a_299_139# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_83_260# A2 a_575_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_575_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_299_139# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VPWR B1 a_401_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_83_260# B2 a_299_139# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_299_139# B1 a_83_260# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/o22a/sky130_fd_sc_ms__o22a_2.cdl b/cells/o22a/sky130_fd_sc_ms__o22a_2.cdl
index 3d83d58..1459e3a 100644
--- a/cells/o22a/sky130_fd_sc_ms__o22a_2.cdl
+++ b/cells/o22a/sky130_fd_sc_ms__o22a_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o22a_2 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 sndB1 B2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 y B2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o22a_2
diff --git a/cells/o22a/sky130_fd_sc_ms__o22a_2.netlist.tsv b/cells/o22a/sky130_fd_sc_ms__o22a_2.netlist.tsv
index 1e96777..b895a4a 100644
--- a/cells/o22a/sky130_fd_sc_ms__o22a_2.netlist.tsv
+++ b/cells/o22a/sky130_fd_sc_ms__o22a_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o22a_2	A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22a/sky130_fd_sc_ms__o22a_2.spice b/cells/o22a/sky130_fd_sc_ms__o22a_2.spice
index 8f2f3a5..b811277 100644
--- a/cells/o22a/sky130_fd_sc_ms__o22a_2.spice
+++ b/cells/o22a/sky130_fd_sc_ms__o22a_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__o22a_2 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_578_384# A2 a_82_48# VPB pshort w=1e+06u l=180000u
-+  ad=3.6e+11p pd=2.72e+06u as=3.3e+11p ps=2.66e+06u
-M1001 X a_82_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=1.3128e+12p ps=8.96e+06u
-M1002 VPWR a_82_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_82_48# B1 a_307_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.294e+11p pd=2.1e+06u as=6.649e+11p ps=6.26e+06u
-M1004 X a_82_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=6.5575e+11p ps=6.24e+06u
-M1005 VPWR A1 a_578_384# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_386_384# B1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1007 a_307_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_82_48# B2 a_386_384# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_82_48# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A2 a_307_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_307_74# B2 a_82_48# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_578_384# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 X a_82_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 X a_82_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND a_82_48# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR B1 a_386_384# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_307_74# B1 a_82_48# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR a_82_48# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND A1 a_307_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_307_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_82_48# A2 a_578_384# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_386_384# B2 a_82_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_82_48# B2 a_307_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o22a/sky130_fd_sc_ms__o22a_4.cdl b/cells/o22a/sky130_fd_sc_ms__o22a_4.cdl
index 30f06dd..dad70db 100644
--- a/cells/o22a/sky130_fd_sc_ms__o22a_4.cdl
+++ b/cells/o22a/sky130_fd_sc_ms__o22a_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o22a_4 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 sndB1 B2 VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 y B2 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o22a_4
diff --git a/cells/o22a/sky130_fd_sc_ms__o22a_4.netlist.tsv b/cells/o22a/sky130_fd_sc_ms__o22a_4.netlist.tsv
index 01931cd..a9e0860 100644
--- a/cells/o22a/sky130_fd_sc_ms__o22a_4.netlist.tsv
+++ b/cells/o22a/sky130_fd_sc_ms__o22a_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o22a_4	A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22a/sky130_fd_sc_ms__o22a_4.spice b/cells/o22a/sky130_fd_sc_ms__o22a_4.spice
index fb43a2d..651d1e9 100644
--- a/cells/o22a/sky130_fd_sc_ms__o22a_4.spice
+++ b/cells/o22a/sky130_fd_sc_ms__o22a_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__o22a_4 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 VPWR A1 a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.0354e+12p pd=1.451e+07u as=5.9e+11p ps=5.18e+06u
-M1001 a_119_392# A2 a_209_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=6.4e+11p ps=5.28e+06u
-M1002 a_119_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_209_392# A2 a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_209_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.44e+11p pd=5.63e+06u as=0p ps=0u
-M1005 a_27_136# B1 a_209_392# VNB nlowvt w=640000u l=150000u
-+  ad=1.0112e+12p pd=9.56e+06u as=3.616e+11p ps=3.69e+06u
-M1006 VGND a_209_392# X VNB nlowvt w=740000u l=150000u
-+  ad=1.1945e+12p pd=1.055e+07u as=4.144e+11p ps=4.08e+06u
-M1007 X a_209_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_209_392# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_209_392# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_209_392# B2 a_27_136# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_209_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_136# B2 a_209_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_136# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A2 a_27_136# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_209_392# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_136# A1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A1 a_27_136# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_209_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_519_392# B1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.9e+11p pd=5.18e+06u as=0p ps=0u
-M1020 a_209_392# B1 a_27_136# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR B1 a_519_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_519_392# B2 a_209_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_209_392# B2 a_519_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_209_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR a_209_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VGND A1 a_27_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_27_136# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_209_392# B2 a_27_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 VGND A2 a_27_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VGND a_209_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR a_209_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_519_392# B2 a_209_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 a_209_392# B1 a_27_136# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_27_136# B2 a_209_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 a_119_392# A2 a_209_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 a_27_136# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 a_209_392# B2 a_519_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 X a_209_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 X a_209_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 X a_209_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_209_392# A2 a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 a_519_392# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X19 VGND a_209_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 VPWR B1 a_519_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X21 VPWR A1 a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X22 a_27_136# B1 a_209_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X23 a_119_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/o22ai/sky130_fd_sc_ms__o22ai_1.cdl b/cells/o22ai/sky130_fd_sc_ms__o22ai_1.cdl
index 3dbf3d6..0492363 100644
--- a/cells/o22ai/sky130_fd_sc_ms__o22ai_1.cdl
+++ b/cells/o22ai/sky130_fd_sc_ms__o22ai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__o22ai_1 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 Y B2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o22ai_1
diff --git a/cells/o22ai/sky130_fd_sc_ms__o22ai_1.netlist.tsv b/cells/o22ai/sky130_fd_sc_ms__o22ai_1.netlist.tsv
index 8d22e2d..5098820 100644
--- a/cells/o22ai/sky130_fd_sc_ms__o22ai_1.netlist.tsv
+++ b/cells/o22ai/sky130_fd_sc_ms__o22ai_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__o22ai_1	A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22ai/sky130_fd_sc_ms__o22ai_1.spice b/cells/o22ai/sky130_fd_sc_ms__o22ai_1.spice
index d5241d5..e0e85d7 100644
--- a/cells/o22ai/sky130_fd_sc_ms__o22ai_1.spice
+++ b/cells/o22ai/sky130_fd_sc_ms__o22ai_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__o22ai_1 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 Y B2 a_145_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=4.368e+11p pd=3.02e+06u as=2.688e+11p ps=2.72e+06u
-M1001 VPWR A1 a_343_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=7.616e+11p pd=5.84e+06u as=4.368e+11p ps=3.02e+06u
-M1002 VGND A2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=6.808e+11p ps=6.28e+06u
-M1003 a_27_74# B2 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.255e+11p ps=2.63e+06u
-M1004 a_27_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_145_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_343_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 Y A2 a_343_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VPWR B1 a_145_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_145_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 Y B2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_343_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o22ai/sky130_fd_sc_ms__o22ai_2.cdl b/cells/o22ai/sky130_fd_sc_ms__o22ai_2.cdl
index 1114764..b2fe519 100644
--- a/cells/o22ai/sky130_fd_sc_ms__o22ai_2.cdl
+++ b/cells/o22ai/sky130_fd_sc_ms__o22ai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__o22ai_2 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 Y B2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o22ai_2
diff --git a/cells/o22ai/sky130_fd_sc_ms__o22ai_2.netlist.tsv b/cells/o22ai/sky130_fd_sc_ms__o22ai_2.netlist.tsv
index 2938524..034fe15 100644
--- a/cells/o22ai/sky130_fd_sc_ms__o22ai_2.netlist.tsv
+++ b/cells/o22ai/sky130_fd_sc_ms__o22ai_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__o22ai_2	A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22ai/sky130_fd_sc_ms__o22ai_2.spice b/cells/o22ai/sky130_fd_sc_ms__o22ai_2.spice
index 0156043..5485fa5 100644
--- a/cells/o22ai/sky130_fd_sc_ms__o22ai_2.spice
+++ b/cells/o22ai/sky130_fd_sc_ms__o22ai_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ms__o22ai_2 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 Y B2 a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=9.296e+11p ps=8.38e+06u
-M1001 VPWR B1 a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.608e+11p pd=5.66e+06u as=0p ps=0u
-M1002 a_28_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.4282e+12p pd=1.126e+07u as=4.958e+11p ps=4.3e+06u
-M1004 a_27_74# B2 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=5.402e+11p ps=4.42e+06u
-M1005 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A2 a_510_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=9.296e+11p ps=8.38e+06u
-M1009 a_510_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_510_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_510_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_28_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_28_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 Y B2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 Y A2 a_510_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_28_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VPWR A1 a_510_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_27_74# B2 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR B1 a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 Y B2 a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_510_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_510_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o22ai/sky130_fd_sc_ms__o22ai_4.cdl b/cells/o22ai/sky130_fd_sc_ms__o22ai_4.cdl
index e65f34b..6b82557 100644
--- a/cells/o22ai/sky130_fd_sc_ms__o22ai_4.cdl
+++ b/cells/o22ai/sky130_fd_sc_ms__o22ai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__o22ai_4 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 Y B2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o22ai_4
diff --git a/cells/o22ai/sky130_fd_sc_ms__o22ai_4.netlist.tsv b/cells/o22ai/sky130_fd_sc_ms__o22ai_4.netlist.tsv
index 4e7c46f..132a764 100644
--- a/cells/o22ai/sky130_fd_sc_ms__o22ai_4.netlist.tsv
+++ b/cells/o22ai/sky130_fd_sc_ms__o22ai_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__o22ai_4	A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22ai/sky130_fd_sc_ms__o22ai_4.spice b/cells/o22ai/sky130_fd_sc_ms__o22ai_4.spice
index 2544fed..b3ffa88 100644
--- a/cells/o22ai/sky130_fd_sc_ms__o22ai_4.spice
+++ b/cells/o22ai/sky130_fd_sc_ms__o22ai_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ms__o22ai_4 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_27_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.0566e+12p pd=1.9e+07u as=1.0582e+12p ps=8.78e+06u
-M1001 a_120_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2096e+12p pd=1.112e+07u as=1.7584e+12p ps=1.434e+07u
-M1002 a_120_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A1 a_120_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A2 a_120_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2768e+12p pd=1.124e+07u as=0p ps=0u
-M1005 a_120_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A2 a_120_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_880_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.3104e+12p pd=1.13e+07u as=0p ps=0u
-M1008 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_120_368# A2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR B1 a_880_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=9.768e+11p ps=8.56e+06u
-M1012 VPWR A1 a_120_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_880_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_74# B2 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y B2 a_880_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_880_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_880_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y B2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y B2 a_880_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_74# B2 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR B1 a_880_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y B2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_120_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_880_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 Y A2 a_120_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y B2 a_880_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_27_74# B2 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR B1 a_880_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 VPWR A1 a_120_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 Y B2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 Y B2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_880_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VPWR A1 a_120_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_880_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 VPWR B1 a_880_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_120_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_27_74# B2 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 a_120_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_880_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_120_368# A2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 Y B2 a_880_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X30 Y A2 a_120_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X31 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.cdl b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.cdl
index ebb17bf..0f6ac96 100644
--- a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.cdl
+++ b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__o2bb2a_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand0 VGND A1_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 nmid B1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inand VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MMNaoi20 y inand VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inand VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPB1 B2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 y inand VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o2bb2a_1
diff --git a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.netlist.tsv b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.netlist.tsv
index d92ca29..8feff51 100644
--- a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.netlist.tsv
+++ b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__o2bb2a_1	A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN2	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inand	nmid	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inand	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inand	nmid	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inand	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.spice b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.spice
index 81c041d..cc43c1c 100644
--- a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.spice
+++ b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__o2bb2a_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 a_236_384# A1_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.73e+11p pd=2.33e+06u as=1.6344e+12p ps=9.5e+06u
-M1001 VGND a_83_260# X VNB nlowvt w=740000u l=150000u
-+  ad=6.211e+11p pd=4.59e+06u as=2.109e+11p ps=2.05e+06u
-M1002 VPWR a_83_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1003 a_253_94# A1_N VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1004 a_236_384# A2_N a_253_94# VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1005 a_696_384# B2 a_83_260# VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=3.172e+11p ps=2.66e+06u
-M1006 a_588_74# a_236_384# a_83_260# VNB nlowvt w=640000u l=150000u
-+  ad=3.616e+11p pd=3.69e+06u as=1.824e+11p ps=1.85e+06u
-M1007 a_83_260# a_236_384# VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B1 a_696_384# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_588_74# B1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A2_N a_236_384# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B2 a_588_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_83_260# a_236_384# a_588_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 VPWR a_236_384# a_83_260# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 a_588_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_253_94# A2_N a_236_384# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_83_260# B2 a_696_384# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VGND A1_N a_253_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 VGND B1 a_588_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 VPWR A1_N a_236_384# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X10 a_696_384# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_236_384# A2_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
 .ends
diff --git a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.cdl b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.cdl
index b5080db..15a091f 100644
--- a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.cdl
+++ b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__o2bb2a_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand0 VGND A1_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 nmid B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inand VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MMNaoi20 y inand VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inand VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPB1 B2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 y inand VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o2bb2a_2
diff --git a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.netlist.tsv b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.netlist.tsv
index 414d15e..85011aa 100644
--- a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.netlist.tsv
+++ b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__o2bb2a_2	A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN2	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inand	nmid	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inand	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inand	nmid	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inand	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.spice b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.spice
index b8c3c30..fd49727 100644
--- a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.spice
+++ b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__o2bb2a_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 a_270_48# A2_N VPWR VPB pshort w=840000u l=180000u
-+  ad=3.024e+11p pd=2.4e+06u as=1.68435e+12p ps=1.199e+07u
-M1001 X a_204_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=7.087e+11p ps=6.4e+06u
-M1002 VPWR A1_N a_270_48# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_500_74# A2_N a_270_48# VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.824e+11p ps=1.85e+06u
-M1004 VPWR a_270_48# a_204_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.3e+11p ps=2.66e+06u
-M1005 a_204_392# a_270_48# a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=4.699e+11p ps=4.23e+06u
-M1006 a_120_392# B1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1007 VGND A1_N a_500_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_204_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1009 VGND B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# B2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_204_392# B2 a_120_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_204_392# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_204_392# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# a_270_48# a_204_392# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 X a_204_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_500_74# A1_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 VGND B2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_204_392# a_270_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_270_48# A1_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X6 VPWR a_204_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_270_48# A2_N a_500_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 VPWR A2_N a_270_48# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 VPWR B1 a_120_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 X a_204_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_120_392# B2 a_204_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 a_27_74# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VGND a_204_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.cdl b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.cdl
index 32a0804..8239c8c 100644
--- a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.cdl
+++ b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__o2bb2a_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand0 VGND A1_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 nmid B1 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inand VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MMNaoi20 y inand VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inand VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPB1 B2 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 y inand VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o2bb2a_4
diff --git a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.netlist.tsv b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.netlist.tsv
index 34a997d..f1559b0 100644
--- a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.netlist.tsv
+++ b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__o2bb2a_4	A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN2	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inand	nmid	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inand	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inand	nmid	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inand	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.spice b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.spice
index 49cea11..76d698b 100644
--- a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.spice
+++ b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__o2bb2a_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 VPWR B1 a_41_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.2314e+12p pd=1.735e+07u as=8.3e+11p ps=7.66e+06u
-M1001 a_41_392# B1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_476_48# A2_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1003 VPWR a_313_392# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=7.224e+11p ps=5.77e+06u
-M1004 X a_313_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=5.217e+11p pd=4.37e+06u as=1.3531e+12p ps=1.093e+07u
-M1005 a_27_74# a_476_48# a_313_392# VNB nlowvt w=640000u l=150000u
-+  ad=7.648e+11p pd=7.51e+06u as=2.016e+11p ps=1.91e+06u
-M1006 a_313_392# B2 a_41_392# VPB pshort w=1e+06u l=180000u
-+  ad=5.556e+11p pd=4.9e+06u as=0p ps=0u
-M1007 VPWR A1_N a_476_48# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_313_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_41_392# B2 a_313_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_476_48# a_313_392# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_313_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_313_392# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_313_392# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_74# B2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_313_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND B2 a_27_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A1_N a_835_94# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1018 VGND a_313_392# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_313_392# a_476_48# a_27_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_835_94# A2_N a_476_48# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.952e+11p ps=1.89e+06u
-M1021 a_313_392# a_476_48# VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND B1 a_27_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_74# B1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_313_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_476_48# A2_N a_835_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 VPWR A2_N a_476_48# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 VPWR a_313_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VGND a_313_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_313_392# a_476_48# a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VGND a_313_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR a_476_48# a_313_392# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X8 a_313_392# a_476_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 VGND B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 VGND B2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 X a_313_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 X a_313_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VPWR B1 a_41_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 X a_313_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_313_392# B2 a_41_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 a_27_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 a_476_48# A1_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X18 a_835_94# A1_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X19 a_27_74# a_476_48# a_313_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X20 a_41_392# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X21 X a_313_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_27_74# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X23 a_41_392# B2 a_313_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.cdl b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.cdl
index 96521bd..aba2f0e 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.cdl
+++ b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o2bb2ai_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A1_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 nmid B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MMNaoi20 Y inand VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPB1 B2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPB pfet_01v8 m=1 w=1.12 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_ms__o2bb2ai_1
diff --git a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.netlist.tsv b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.netlist.tsv
index 578d0bd..c9f38e4 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.netlist.tsv
+++ b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o2bb2ai_1	A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.spice b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.spice
index c5dcd3d..f630712 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.spice
+++ b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__o2bb2ai_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 a_397_74# B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.699e+11p pd=4.23e+06u as=3.896e+11p ps=3.89e+06u
-M1001 Y a_134_383# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=1.30342e+12p ps=8.81e+06u
-M1002 VPWR B1 a_493_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.36e+11p ps=2.84e+06u
-M1003 a_493_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_134_383# A2_N a_114_74# VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=1.536e+11p ps=1.76e+06u
-M1005 a_134_383# A1_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1006 VPWR A2_N a_134_383# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B2 a_397_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_397_74# a_134_383# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1009 a_114_74# A1_N VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_134_383# A2_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 VPWR a_134_383# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VPWR A1_N a_134_383# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 a_397_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_493_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 Y B2 a_493_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 Y a_134_383# a_397_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VGND B1 a_397_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VGND A1_N a_114_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_114_74# A2_N a_134_383# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.cdl b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.cdl
index 186697c..d59f3d4 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.cdl
+++ b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o2bb2ai_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A1_N VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 nmid B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265
+MMNaoi20 Y inand VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPB1 B2 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPB pfet_01v8 m=2 w=1.12 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_ms__o2bb2ai_2
diff --git a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.netlist.tsv b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.netlist.tsv
index 35531c9..28e86d5 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.netlist.tsv
+++ b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o2bb2ai_2	A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.spice b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.spice
index fbb3b1a..7d44a4a 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.spice
+++ b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__o2bb2ai_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 Y a_136_387# a_518_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=8.954e+11p ps=8.34e+06u
-M1001 a_136_387# A1_N VPWR VPB pshort w=840000u l=180000u
-+  ad=5.46225e+11p pd=4.82e+06u as=2.03735e+12p ps=1.491e+07u
-M1002 VGND B2 a_518_74# VNB nlowvt w=740000u l=150000u
-+  ad=8.869e+11p pd=8.09e+06u as=0p ps=0u
-M1003 VPWR A2_N a_136_387# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_799_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1005 Y B2 a_799_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.216e+11p pd=5.59e+06u as=0p ps=0u
-M1006 a_518_74# a_136_387# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_134_74# A1_N VGND VNB nlowvt w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=0p ps=0u
-M1008 a_136_387# A2_N a_134_74# VNB nlowvt w=640000u l=150000u
-+  ad=2.272e+11p pd=1.99e+06u as=0p ps=0u
-M1009 a_799_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_518_74# B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y a_136_387# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A1_N a_134_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR B1 a_799_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A1_N a_136_387# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_518_74# B2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_136_387# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND B1 a_518_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_136_387# A2_N VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_134_74# A2_N a_136_387# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1_N a_136_387# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 a_136_387# A2_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 a_518_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND B2 a_518_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_799_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_134_74# A2_N a_136_387# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VGND B1 a_518_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VGND A1_N a_134_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_518_74# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR A2_N a_136_387# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X10 a_136_387# A1_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X11 Y a_136_387# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 VPWR a_136_387# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_518_74# a_136_387# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VPWR B1 a_799_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 Y B2 a_799_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_134_74# A1_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 Y a_136_387# a_518_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_799_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_136_387# A2_N a_134_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.cdl b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.cdl
index bb6f68e..61e37bf 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.cdl
+++ b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o2bb2ai_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A1_N VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 nmid B1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265
+MMNaoi20 Y inand VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPB1 B2 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPB pfet_01v8 m=4 w=1.12 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_ms__o2bb2ai_4
diff --git a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.netlist.tsv b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.netlist.tsv
index e1052b7..391be84 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.netlist.tsv
+++ b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o2bb2ai_4	A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.spice b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.spice
index dd345dc..875d988 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.spice
+++ b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ms__o2bb2ai_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 a_117_368# A2_N VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2096e+12p pd=1.112e+07u as=2.7216e+12p ps=2.502e+07u
-M1001 Y B2 a_1215_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2096e+12p pd=1.112e+07u as=1.512e+12p ps=1.39e+07u
-M1002 VGND B2 a_857_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.3986e+12p pd=1.266e+07u as=1.4578e+12p ps=1.43e+07u
-M1003 VPWR A2_N a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_1215_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_117_368# A2_N VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_857_74# B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B1 a_1215_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_74# A2_N a_117_368# VNB nlowvt w=740000u l=150000u
-+  ad=1.1211e+12p pd=1.043e+07u as=4.477e+11p ps=4.17e+06u
-M1009 a_857_74# a_117_368# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1010 VPWR A2_N a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1215_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_74# A1_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND B1 a_857_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y a_117_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR B1 a_1215_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND B1 a_857_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_117_368# A2_N a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y a_117_368# a_857_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_117_368# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1215_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y a_117_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_117_368# A2_N a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_857_74# a_117_368# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_857_74# B2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND B2 a_857_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_117_368# A1_N VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A1_N a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_117_368# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y a_117_368# a_857_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_117_368# A1_N VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y B2 a_1215_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND A1_N a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_27_74# A1_N VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND A1_N a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_857_74# B1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR A1_N a_117_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1215_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_857_74# B2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_27_74# A2_N a_117_368# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_857_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_857_74# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 Y a_117_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Y a_117_368# a_857_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR A1_N a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VGND A1_N a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_857_74# B1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR A2_N a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 Y a_117_368# a_857_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR A2_N a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 VGND A1_N a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_117_368# A2_N a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_1215_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VPWR a_117_368# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_1215_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_27_74# A2_N a_117_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 Y a_117_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_1215_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 a_1215_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_117_368# A1_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 VPWR B1 a_1215_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 a_857_74# a_117_368# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 a_117_368# A1_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_117_368# A2_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_27_74# A2_N a_117_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 VGND B2 a_857_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 VGND B2 a_857_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 a_117_368# A2_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 Y B2 a_1215_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X29 a_117_368# A2_N a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X30 a_857_74# a_117_368# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 Y B2 a_1215_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 a_27_74# A1_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 VGND B1 a_857_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 VGND B1 a_857_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X35 VPWR A1_N a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X36 VPWR a_117_368# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X37 VPWR B1 a_1215_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X38 a_27_74# A1_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X39 a_857_74# B2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o311a/sky130_fd_sc_ms__o311a_1.cdl b/cells/o311a/sky130_fd_sc_ms__o311a_1.cdl
index 329e8d3..476296a 100644
--- a/cells/o311a/sky130_fd_sc_ms__o311a_1.cdl
+++ b/cells/o311a/sky130_fd_sc_ms__o311a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__o311a_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 sndA2 A3 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=1 w=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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o311a_1
diff --git a/cells/o311a/sky130_fd_sc_ms__o311a_1.netlist.tsv b/cells/o311a/sky130_fd_sc_ms__o311a_1.netlist.tsv
index c8da614..71e2d7f 100644
--- a/cells/o311a/sky130_fd_sc_ms__o311a_1.netlist.tsv
+++ b/cells/o311a/sky130_fd_sc_ms__o311a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__o311a_1	A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8	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	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311a/sky130_fd_sc_ms__o311a_1.spice b/cells/o311a/sky130_fd_sc_ms__o311a_1.spice
index 28d2d54..229b93a 100644
--- a/cells/o311a/sky130_fd_sc_ms__o311a_1.spice
+++ b/cells/o311a/sky130_fd_sc_ms__o311a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__o311a_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 VGND A1 a_209_74# VNB nlowvt w=640000u l=150000u
-+  ad=6.202e+11p pd=4.62e+06u as=8.448e+11p ps=5.2e+06u
-M1001 VPWR A1 a_539_387# VPB pshort w=1e+06u l=180000u
-+  ad=8.42e+11p pd=5.86e+06u as=3.9e+11p ps=2.78e+06u
-M1002 a_209_74# B1 a_131_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1003 a_539_387# A2 a_323_387# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=9e+11p ps=3.8e+06u
-M1004 a_131_74# C1 a_31_387# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1005 a_209_74# A3 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_31_387# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1007 VGND A2 a_209_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_31_387# B1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.5e+11p pd=5.1e+06u as=0p ps=0u
-M1009 a_323_387# A3 a_31_387# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR C1 a_31_387# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_31_387# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
+X0 a_131_74# B1 a_209_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 a_209_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_209_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 VGND A3 a_209_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_323_387# A2 a_539_387# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_31_387# A3 a_323_387# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_539_387# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VGND a_31_387# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VPWR B1 a_31_387# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 a_31_387# C1 a_131_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_31_387# C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 VPWR a_31_387# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/o311a/sky130_fd_sc_ms__o311a_2.cdl b/cells/o311a/sky130_fd_sc_ms__o311a_2.cdl
index bcc2d0d..7a0778e 100644
--- a/cells/o311a/sky130_fd_sc_ms__o311a_2.cdl
+++ b/cells/o311a/sky130_fd_sc_ms__o311a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__o311a_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=1 w=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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o311a_2
diff --git a/cells/o311a/sky130_fd_sc_ms__o311a_2.netlist.tsv b/cells/o311a/sky130_fd_sc_ms__o311a_2.netlist.tsv
index 50ff480..c7cb95d 100644
--- a/cells/o311a/sky130_fd_sc_ms__o311a_2.netlist.tsv
+++ b/cells/o311a/sky130_fd_sc_ms__o311a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__o311a_2	A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311a/sky130_fd_sc_ms__o311a_2.spice b/cells/o311a/sky130_fd_sc_ms__o311a_2.spice
index fcc97ac..b3d28c6 100644
--- a/cells/o311a/sky130_fd_sc_ms__o311a_2.spice
+++ b/cells/o311a/sky130_fd_sc_ms__o311a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__o311a_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 a_219_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.958e+11p pd=4.3e+06u as=1.1042e+12p ps=7.58e+06u
-M1001 a_135_74# C1 a_32_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.998e+11p pd=2.02e+06u as=2.701e+11p ps=2.21e+06u
-M1002 VGND A3 a_219_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_447_368# A2 a_363_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=4.032e+11p pd=2.96e+06u as=2.688e+11p ps=2.72e+06u
-M1004 VPWR A1 a_447_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2132e+12p pd=8.73e+06u as=0p ps=0u
-M1005 X a_32_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1006 a_32_74# B1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=6.736e+11p pd=5.52e+06u as=0p ps=0u
-M1007 VPWR C1 a_32_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A1 a_219_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_32_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_363_368# A3 a_32_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_32_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1012 VPWR a_32_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_219_74# B1 a_135_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_32_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_32_74# C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_135_74# B1 a_219_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_363_368# A2 a_447_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_219_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VGND a_32_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_219_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR B1 a_32_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_32_74# C1 a_135_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VGND A2 a_219_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 X a_32_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_32_74# A3 a_363_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 X a_32_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_447_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/o311a/sky130_fd_sc_ms__o311a_4.cdl b/cells/o311a/sky130_fd_sc_ms__o311a_4.cdl
index fa66620..7805d3d 100644
--- a/cells/o311a/sky130_fd_sc_ms__o311a_4.cdl
+++ b/cells/o311a/sky130_fd_sc_ms__o311a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__o311a_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 sndA2 A3 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=2 w=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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o311a_4
diff --git a/cells/o311a/sky130_fd_sc_ms__o311a_4.netlist.tsv b/cells/o311a/sky130_fd_sc_ms__o311a_4.netlist.tsv
index 8cf8d9c..08376da 100644
--- a/cells/o311a/sky130_fd_sc_ms__o311a_4.netlist.tsv
+++ b/cells/o311a/sky130_fd_sc_ms__o311a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__o311a_4	A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311a/sky130_fd_sc_ms__o311a_4.spice b/cells/o311a/sky130_fd_sc_ms__o311a_4.spice
index 6c37b1a..afca90e 100644
--- a/cells/o311a/sky130_fd_sc_ms__o311a_4.spice
+++ b/cells/o311a/sky130_fd_sc_ms__o311a_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__o311a_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 VPWR C1 a_83_244# VPB pshort w=1e+06u l=180000u
-+  ad=2.262e+12p pd=1.704e+07u as=1e+12p ps=8e+06u
-M1001 X a_83_244# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.662e+11p pd=4.22e+06u as=1.5521e+12p ps=1.276e+07u
-M1002 VPWR A1 a_1341_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=6.8e+11p ps=5.36e+06u
-M1003 a_83_244# B1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_1341_392# A2 a_1034_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.015e+12p ps=8.03e+06u
-M1005 a_1341_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_564_78# A1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.02922e+12p pd=9.63e+06u as=0p ps=0u
-M1007 a_651_78# B1 a_564_78# VNB nlowvt w=640000u l=150000u
-+  ad=6.88e+11p pd=4.71e+06u as=0p ps=0u
-M1008 a_83_244# A3 a_1034_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_83_244# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=8.12e+11p pd=5.93e+06u as=0p ps=0u
-M1010 X a_83_244# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_83_244# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1034_392# A3 a_83_244# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_83_244# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_83_244# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_564_78# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1034_392# A2 a_1341_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_83_244# C1 a_651_78# VNB nlowvt w=640000u l=150000u
-+  ad=3.4395e+11p pd=2.59e+06u as=0p ps=0u
-M1018 VPWR a_83_244# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_83_244# C1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR B1 a_83_244# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_564_78# A3 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A2 a_564_78# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_651_78# C1 a_83_244# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A3 a_564_78# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_83_244# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_564_78# B1 a_651_78# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A1 a_564_78# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_651_78# B1 a_564_78# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 VPWR B1 a_83_244# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_83_244# C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 a_83_244# A3 a_1034_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VGND a_83_244# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 X a_83_244# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VPWR A1 a_1341_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VGND A3 a_564_78# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_564_78# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_564_78# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_1034_392# A3 a_83_244# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_83_244# C1 a_651_78# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 VPWR a_83_244# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VGND A1 a_564_78# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 VGND a_83_244# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 VPWR C1 a_83_244# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 a_1034_392# A2 a_1341_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X17 a_1341_392# A2 a_1034_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 VPWR a_83_244# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_651_78# C1 a_83_244# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X20 a_1341_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X21 VGND A2 a_564_78# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X22 X a_83_244# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_83_244# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X24 X a_83_244# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 a_564_78# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X26 X a_83_244# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 a_564_78# B1 a_651_78# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/o311ai/sky130_fd_sc_ms__o311ai_1.cdl b/cells/o311ai/sky130_fd_sc_ms__o311ai_1.cdl
index d49eb2e..1b10dae 100644
--- a/cells/o311ai/sky130_fd_sc_ms__o311ai_1.cdl
+++ b/cells/o311ai/sky130_fd_sc_ms__o311ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o311ai_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o311ai_1
diff --git a/cells/o311ai/sky130_fd_sc_ms__o311ai_1.netlist.tsv b/cells/o311ai/sky130_fd_sc_ms__o311ai_1.netlist.tsv
index 188b704..8d8920c 100644
--- a/cells/o311ai/sky130_fd_sc_ms__o311ai_1.netlist.tsv
+++ b/cells/o311ai/sky130_fd_sc_ms__o311ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o311ai_1	A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311ai/sky130_fd_sc_ms__o311ai_1.spice b/cells/o311ai/sky130_fd_sc_ms__o311ai_1.spice
index 002a86b..b55a40b 100644
--- a/cells/o311ai/sky130_fd_sc_ms__o311ai_1.spice
+++ b/cells/o311ai/sky130_fd_sc_ms__o311ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__o311ai_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 Y C1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=7.504e+11p pd=5.82e+06u as=7.504e+11p ps=5.82e+06u
-M1001 Y C1 a_469_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=2.294e+11p ps=2.1e+06u
-M1002 a_141_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.688e+11p pd=2.72e+06u as=0p ps=0u
-M1003 a_128_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.847e+11p pd=4.27e+06u as=7.067e+11p ps=4.87e+06u
-M1004 a_225_368# A2 a_141_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=4.368e+11p pd=3.02e+06u as=0p ps=0u
-M1005 VPWR B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_469_74# B1 a_128_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A3 a_225_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_128_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_128_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_469_74# C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VPWR A1 a_141_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_128_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_128_74# B1 a_469_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VGND A3 a_128_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VGND A1 a_128_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_141_368# A2 a_225_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_225_368# A3 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/o311ai/sky130_fd_sc_ms__o311ai_2.cdl b/cells/o311ai/sky130_fd_sc_ms__o311ai_2.cdl
index 9d40cd4..90fea71 100644
--- a/cells/o311ai/sky130_fd_sc_ms__o311ai_2.cdl
+++ b/cells/o311ai/sky130_fd_sc_ms__o311ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o311ai_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o311ai_2
diff --git a/cells/o311ai/sky130_fd_sc_ms__o311ai_2.netlist.tsv b/cells/o311ai/sky130_fd_sc_ms__o311ai_2.netlist.tsv
index fa522b0..405ace1 100644
--- a/cells/o311ai/sky130_fd_sc_ms__o311ai_2.netlist.tsv
+++ b/cells/o311ai/sky130_fd_sc_ms__o311ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o311ai_2	A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311ai/sky130_fd_sc_ms__o311ai_2.spice b/cells/o311ai/sky130_fd_sc_ms__o311ai_2.spice
index 5a55470..f725d2f 100644
--- a/cells/o311ai/sky130_fd_sc_ms__o311ai_2.spice
+++ b/cells/o311ai/sky130_fd_sc_ms__o311ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__o311ai_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 VPWR B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=9.184e+11p pd=8.36e+06u as=1.232e+12p ps=1.116e+07u
-M1001 a_310_368# A2 a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.832e+11p pd=5.7e+06u as=9.744e+11p ps=8.46e+06u
-M1002 a_28_368# A2 a_310_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.1174e+12p pd=1.042e+07u as=6.956e+11p ps=6.32e+06u
-M1004 a_670_74# C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=5.18e+11p pd=4.36e+06u as=4.218e+11p ps=4.1e+06u
-M1005 VPWR A1 a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_670_74# B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A3 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y C1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y C1 a_670_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_28_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_74# B1 a_670_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_310_368# A3 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A3 a_310_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 Y C1 a_670_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_28_368# A2 a_310_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_27_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_670_74# B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 Y A3 a_310_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_670_74# C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_28_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 VPWR A1 a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_310_368# A2 a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 VGND A3 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_310_368# A3 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_27_74# B1 a_670_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o311ai/sky130_fd_sc_ms__o311ai_4.cdl b/cells/o311ai/sky130_fd_sc_ms__o311ai_4.cdl
index 744dc78..ed8c3e6 100644
--- a/cells/o311ai/sky130_fd_sc_ms__o311ai_4.cdl
+++ b/cells/o311ai/sky130_fd_sc_ms__o311ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o311ai_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPC0 VPWR C1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o311ai_4
diff --git a/cells/o311ai/sky130_fd_sc_ms__o311ai_4.netlist.tsv b/cells/o311ai/sky130_fd_sc_ms__o311ai_4.netlist.tsv
index 283588c..7708dcd 100644
--- a/cells/o311ai/sky130_fd_sc_ms__o311ai_4.netlist.tsv
+++ b/cells/o311ai/sky130_fd_sc_ms__o311ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o311ai_4	A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311ai/sky130_fd_sc_ms__o311ai_4.spice b/cells/o311ai/sky130_fd_sc_ms__o311ai_4.spice
index 5610795..4245a5d 100644
--- a/cells/o311ai/sky130_fd_sc_ms__o311ai_4.spice
+++ b/cells/o311ai/sky130_fd_sc_ms__o311ai_4.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_ms__o311ai_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 Y A3 a_841_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.7192e+12p pd=1.203e+07u as=1.7248e+12p ps=1.428e+07u
-M1001 VGND A1 a_459_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.19225e+12p pd=1.657e+07u as=1.7316e+12p ps=1.652e+07u
-M1002 a_459_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_459_74# B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.02765e+12p ps=1.022e+07u
-M1004 VGND A2 a_459_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y C1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.181e+11p pd=4.09e+06u as=0p ps=0u
-M1006 a_459_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A1 a_459_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1353_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2656e+12p pd=1.122e+07u as=3.4832e+12p ps=1.966e+07u
-M1009 VPWR A1 a_1353_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y C1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A3 a_459_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A3 a_841_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_459_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1353_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_459_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_74# B1 a_459_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_74# B1 a_459_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_459_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_74# C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_74# C1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR C1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1353_368# A2 a_841_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_841_368# A3 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_841_368# A2 a_1353_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A3 a_459_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_841_368# A2 a_1353_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND A2 a_459_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1353_368# A2 a_841_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_459_74# B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y C1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR A1 a_1353_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_841_368# A3 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_459_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_1353_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_1353_368# A2 a_841_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Y C1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR A1 a_1353_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_27_74# B1 a_459_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_459_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_841_368# A3 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 Y C1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND A3 a_459_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_459_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_459_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_459_74# B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VGND A2 a_459_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 Y A3 a_841_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_841_368# A2 a_1353_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 a_459_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_841_368# A3 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_459_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_841_368# A2 a_1353_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_27_74# B1 a_459_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_459_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 a_1353_368# A2 a_841_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 a_1353_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 VGND A1 a_459_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 VPWR A1 a_1353_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X30 VGND A1 a_459_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 VGND A2 a_459_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X32 VGND A3 a_459_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 Y A3 a_841_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X34 a_27_74# C1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X35 a_459_74# B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o31a/sky130_fd_sc_ms__o31a_1.cdl b/cells/o31a/sky130_fd_sc_ms__o31a_1.cdl
index 7641146..2247fd6 100644
--- a/cells/o31a/sky130_fd_sc_ms__o31a_1.cdl
+++ b/cells/o31a/sky130_fd_sc_ms__o31a_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o31a_1 A1 A2 A3 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 sndA2 A3 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=1 w=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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o31a_1
diff --git a/cells/o31a/sky130_fd_sc_ms__o31a_1.netlist.tsv b/cells/o31a/sky130_fd_sc_ms__o31a_1.netlist.tsv
index c7f5449..7bb280d 100644
--- a/cells/o31a/sky130_fd_sc_ms__o31a_1.netlist.tsv
+++ b/cells/o31a/sky130_fd_sc_ms__o31a_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o31a_1	A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31a/sky130_fd_sc_ms__o31a_1.spice b/cells/o31a/sky130_fd_sc_ms__o31a_1.spice
index a4a8ed3..ffa1acd 100644
--- a/cells/o31a/sky130_fd_sc_ms__o31a_1.spice
+++ b/cells/o31a/sky130_fd_sc_ms__o31a_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__o31a_1 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 a_230_94# A3 VGND VNB nlowvt w=640000u l=150000u
-+  ad=4.48e+11p pd=3.96e+06u as=6.755e+11p ps=4.76e+06u
-M1001 a_84_48# B1 a_230_94# VNB nlowvt w=640000u l=150000u
-+  ad=2.272e+11p pd=1.99e+06u as=0p ps=0u
-M1002 a_84_48# A3 a_343_368# VPB pshort w=1e+06u l=180000u
-+  ad=3.472e+11p pd=2.72e+06u as=3.3e+11p ps=2.66e+06u
-M1003 VGND A2 a_230_94# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_259_368# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=9.36e+11p ps=5.86e+06u
-M1005 VPWR B1 a_84_48# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_84_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1007 a_230_94# A1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_84_48# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1009 a_343_368# A2 a_259_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_343_368# A3 a_84_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_230_94# B1 a_84_48# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 VPWR A1 a_259_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 VGND A1 a_230_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 VGND A3 a_230_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_259_368# A2 a_343_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 X a_84_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_84_48# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X8 a_230_94# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 X a_84_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o31a/sky130_fd_sc_ms__o31a_2.cdl b/cells/o31a/sky130_fd_sc_ms__o31a_2.cdl
index bf7b906..d4996e6 100644
--- a/cells/o31a/sky130_fd_sc_ms__o31a_2.cdl
+++ b/cells/o31a/sky130_fd_sc_ms__o31a_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o31a_2 A1 A2 A3 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 sndA2 A3 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o31a_2
diff --git a/cells/o31a/sky130_fd_sc_ms__o31a_2.netlist.tsv b/cells/o31a/sky130_fd_sc_ms__o31a_2.netlist.tsv
index 721f543..0f62b5b 100644
--- a/cells/o31a/sky130_fd_sc_ms__o31a_2.netlist.tsv
+++ b/cells/o31a/sky130_fd_sc_ms__o31a_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o31a_2	A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31a/sky130_fd_sc_ms__o31a_2.spice b/cells/o31a/sky130_fd_sc_ms__o31a_2.spice
index 416009e..bd60887 100644
--- a/cells/o31a/sky130_fd_sc_ms__o31a_2.spice
+++ b/cells/o31a/sky130_fd_sc_ms__o31a_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__o31a_2 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 a_55_264# A3 a_433_392# VPB pshort w=1e+06u l=180000u
-+  ad=3.6e+11p pd=2.72e+06u as=3.9e+11p ps=2.78e+06u
-M1001 VPWR B1 a_55_264# VPB pshort w=1e+06u l=180000u
-+  ad=1.2386e+12p pd=8.83e+06u as=0p ps=0u
-M1002 VGND A2 a_328_74# VNB nlowvt w=740000u l=150000u
-+  ad=8.843e+11p pd=6.83e+06u as=6.216e+11p ps=4.64e+06u
-M1003 a_55_264# B1 a_328_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.627e+11p pd=2.19e+06u as=0p ps=0u
-M1004 X a_55_264# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.64e+11p pd=2.89e+06u as=0p ps=0u
-M1005 VGND a_55_264# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1006 X a_55_264# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_349_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1008 a_328_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_433_392# A2 a_349_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_328_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_55_264# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1 a_328_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_55_264# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VGND a_55_264# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_349_392# A2 a_433_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VPWR a_55_264# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 X a_55_264# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_433_392# A3 a_55_264# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 X a_55_264# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VPWR A1 a_349_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 VGND A3 a_328_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_328_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_328_74# B1 a_55_264# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o31a/sky130_fd_sc_ms__o31a_4.cdl b/cells/o31a/sky130_fd_sc_ms__o31a_4.cdl
index ba21c4b..64c7635 100644
--- a/cells/o31a/sky130_fd_sc_ms__o31a_4.cdl
+++ b/cells/o31a/sky130_fd_sc_ms__o31a_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o31a_4 A1 A2 A3 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 sndA2 A3 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=2 w=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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o31a_4
diff --git a/cells/o31a/sky130_fd_sc_ms__o31a_4.netlist.tsv b/cells/o31a/sky130_fd_sc_ms__o31a_4.netlist.tsv
index f1bd6c2..c1d9a27 100644
--- a/cells/o31a/sky130_fd_sc_ms__o31a_4.netlist.tsv
+++ b/cells/o31a/sky130_fd_sc_ms__o31a_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o31a_4	A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31a/sky130_fd_sc_ms__o31a_4.spice b/cells/o31a/sky130_fd_sc_ms__o31a_4.spice
index bea5684..cff4120 100644
--- a/cells/o31a/sky130_fd_sc_ms__o31a_4.spice
+++ b/cells/o31a/sky130_fd_sc_ms__o31a_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__o31a_4 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 VPWR A1 a_971_392# VPB pshort w=1e+06u l=180000u
-+  ad=1.6046e+12p pd=1.373e+07u as=5.8e+11p ps=5.16e+06u
-M1001 a_971_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_86_260# B1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.4e+11p pd=5.08e+06u as=0p ps=0u
-M1003 VGND a_86_260# X VNB nlowvt w=740000u l=150000u
-+  ad=1.2225e+12p pd=1.183e+07u as=4.144e+11p ps=4.08e+06u
-M1004 VPWR B1 a_86_260# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_699_392# A2 a_971_392# VPB pshort w=1e+06u l=180000u
-+  ad=8.4e+11p pd=7.68e+06u as=0p ps=0u
-M1006 X a_86_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_86_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=6.048e+11p ps=5.56e+06u
-M1008 X a_86_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_492_125# B1 a_86_260# VNB nlowvt w=640000u l=150000u
-+  ad=1.0624e+12p pd=9.72e+06u as=2.112e+11p ps=1.94e+06u
-M1010 VGND A2 a_492_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_86_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_86_260# A3 a_699_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_699_392# A3 a_86_260# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_86_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_971_392# A2 a_699_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A1 a_492_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_492_125# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_86_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_492_125# A1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_86_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A3 a_492_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_492_125# A3 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_86_260# B1 a_492_125# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_86_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_492_125# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_86_260# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 a_971_392# A2 a_699_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VGND A3 a_492_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_699_392# A3 a_86_260# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_86_260# B1 a_492_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X7 a_699_392# A2 a_971_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 VPWR a_86_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_492_125# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_971_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 VGND a_86_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_492_125# B1 a_86_260# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 VGND A2 a_492_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 VPWR A1 a_971_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X15 VPWR B1 a_86_260# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 X a_86_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 VGND a_86_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 X a_86_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_86_260# A3 a_699_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X20 X a_86_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 X a_86_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_492_125# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X23 VGND A1 a_492_125# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/o31ai/sky130_fd_sc_ms__o31ai_1.cdl b/cells/o31ai/sky130_fd_sc_ms__o31ai_1.cdl
index b8d0d0a..1e4f454 100644
--- a/cells/o31ai/sky130_fd_sc_ms__o31ai_1.cdl
+++ b/cells/o31ai/sky130_fd_sc_ms__o31ai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__o31ai_1 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o31ai_1
diff --git a/cells/o31ai/sky130_fd_sc_ms__o31ai_1.netlist.tsv b/cells/o31ai/sky130_fd_sc_ms__o31ai_1.netlist.tsv
index 39e0c69..fca032f 100644
--- a/cells/o31ai/sky130_fd_sc_ms__o31ai_1.netlist.tsv
+++ b/cells/o31ai/sky130_fd_sc_ms__o31ai_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__o31ai_1	A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31ai/sky130_fd_sc_ms__o31ai_1.spice b/cells/o31ai/sky130_fd_sc_ms__o31ai_1.spice
index 809ad8b..8b5474a 100644
--- a/cells/o31ai/sky130_fd_sc_ms__o31ai_1.spice
+++ b/cells/o31ai/sky130_fd_sc_ms__o31ai_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__o31ai_1 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 a_206_368# A2 a_122_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=4.368e+11p pd=3.02e+06u as=2.688e+11p ps=2.72e+06u
-M1001 a_114_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.292e+11p pd=4.12e+06u as=9.093e+11p ps=5.45e+06u
-M1002 Y B1 a_114_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.479e+11p pd=2.15e+06u as=0p ps=0u
-M1003 a_122_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=6.272e+11p ps=5.6e+06u
-M1004 VPWR B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=7.392e+11p ps=3.56e+06u
-M1005 a_114_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2 a_114_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A3 a_206_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_122_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_114_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_114_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VGND A3 a_114_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_122_368# A2 a_206_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_206_368# A3 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND A1 a_114_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o31ai/sky130_fd_sc_ms__o31ai_2.cdl b/cells/o31ai/sky130_fd_sc_ms__o31ai_2.cdl
index e44aa27..d929ee7 100644
--- a/cells/o31ai/sky130_fd_sc_ms__o31ai_2.cdl
+++ b/cells/o31ai/sky130_fd_sc_ms__o31ai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__o31ai_2 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o31ai_2
diff --git a/cells/o31ai/sky130_fd_sc_ms__o31ai_2.netlist.tsv b/cells/o31ai/sky130_fd_sc_ms__o31ai_2.netlist.tsv
index 214247f..591e099 100644
--- a/cells/o31ai/sky130_fd_sc_ms__o31ai_2.netlist.tsv
+++ b/cells/o31ai/sky130_fd_sc_ms__o31ai_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__o31ai_2	A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31ai/sky130_fd_sc_ms__o31ai_2.spice b/cells/o31ai/sky130_fd_sc_ms__o31ai_2.spice
index 1725af4..ede9307 100644
--- a/cells/o31ai/sky130_fd_sc_ms__o31ai_2.spice
+++ b/cells/o31ai/sky130_fd_sc_ms__o31ai_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ms__o31ai_2 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=9.296e+11p ps=8.38e+06u
-M1001 a_28_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_300_368# A2 a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1003 VGND A3 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.2616e+12p pd=7.93e+06u as=1.0582e+12p ps=1.026e+07u
-M1004 a_28_368# A2 a_300_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.442e+11p pd=2.14e+06u as=0p ps=0u
-M1008 a_27_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_300_368# A3 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=9.856e+11p ps=8.48e+06u
-M1010 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A3 a_300_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_300_368# A2 a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_27_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_300_368# A3 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_28_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_28_368# A2 a_300_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 Y A3 a_300_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VGND A3 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o31ai/sky130_fd_sc_ms__o31ai_4.cdl b/cells/o31ai/sky130_fd_sc_ms__o31ai_4.cdl
index 3d0e1a0..bf0bf32 100644
--- a/cells/o31ai/sky130_fd_sc_ms__o31ai_4.cdl
+++ b/cells/o31ai/sky130_fd_sc_ms__o31ai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__o31ai_4 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o31ai_4
diff --git a/cells/o31ai/sky130_fd_sc_ms__o31ai_4.netlist.tsv b/cells/o31ai/sky130_fd_sc_ms__o31ai_4.netlist.tsv
index 0aa5223..c10e087 100644
--- a/cells/o31ai/sky130_fd_sc_ms__o31ai_4.netlist.tsv
+++ b/cells/o31ai/sky130_fd_sc_ms__o31ai_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__o31ai_4	A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31ai/sky130_fd_sc_ms__o31ai_4.spice b/cells/o31ai/sky130_fd_sc_ms__o31ai_4.spice
index a116fa8..4a853a2 100644
--- a/cells/o31ai/sky130_fd_sc_ms__o31ai_4.spice
+++ b/cells/o31ai/sky130_fd_sc_ms__o31ai_4.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_ms__o31ai_4 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 VGND A1 a_27_82# VNB nlowvt w=740000u l=150000u
-+  ad=2.2892e+12p pd=1.54e+07u as=1.924e+12p ps=1.852e+07u
-M1001 VPWR A1 a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.7976e+12p pd=9.93e+06u as=1.8928e+12p ps=1.458e+07u
-M1002 a_28_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A2 a_27_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_82# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_28_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A1 a_27_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_490_368# A2 a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2656e+12p pd=1.122e+07u as=0p ps=0u
-M1009 a_28_368# A2 a_490_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_82# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_82# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.288e+12p pd=1.126e+07u as=0p ps=0u
-M1013 Y B1 a_27_82# VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1014 VGND A3 a_27_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A2 a_27_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y B1 a_27_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_490_368# A3 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_82# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A3 a_27_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_490_368# A2 a_28_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_82# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A3 a_490_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_28_368# A2 a_490_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_82# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_490_368# A3 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_82# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_27_82# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y A3 a_490_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_27_82# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VGND A2 a_27_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_27_82# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_27_82# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VGND A3 a_27_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_27_82# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 Y A3 a_490_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VGND A3 a_27_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_490_368# A2 a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_27_82# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_28_368# A2 a_490_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VGND A2 a_27_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_27_82# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 Y B1 a_27_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_28_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 Y B1 a_27_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_490_368# A2 a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 Y A3 a_490_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_28_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 a_490_368# A3 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_490_368# A3 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_28_368# A2 a_490_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_27_82# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 VPWR A1 a_28_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 VGND A1 a_27_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 VGND A1 a_27_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_27_82# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o32a/sky130_fd_sc_ms__o32a_1.cdl b/cells/o32a/sky130_fd_sc_ms__o32a_1.cdl
index 67be786..4e97cf4 100644
--- a/cells/o32a/sky130_fd_sc_ms__o32a_1.cdl
+++ b/cells/o32a/sky130_fd_sc_ms__o32a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__o32a_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 sndA2 A3 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 sndB1 B2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=1 w=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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 y B2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o32a_1
diff --git a/cells/o32a/sky130_fd_sc_ms__o32a_1.netlist.tsv b/cells/o32a/sky130_fd_sc_ms__o32a_1.netlist.tsv
index cf95415..7ac35ed 100644
--- a/cells/o32a/sky130_fd_sc_ms__o32a_1.netlist.tsv
+++ b/cells/o32a/sky130_fd_sc_ms__o32a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__o32a_1	A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8	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	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32a/sky130_fd_sc_ms__o32a_1.spice b/cells/o32a/sky130_fd_sc_ms__o32a_1.spice
index 3e5b8cc..675a49a 100644
--- a/cells/o32a/sky130_fd_sc_ms__o32a_1.spice
+++ b/cells/o32a/sky130_fd_sc_ms__o32a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__o32a_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_251_74# B1 a_83_264# VNB nlowvt w=640000u l=150000u
-+  ad=6.176e+11p pd=5.77e+06u as=2.848e+11p ps=2.17e+06u
-M1001 a_551_368# B2 a_83_264# VPB pshort w=1e+06u l=180000u
-+  ad=4.15e+11p pd=2.83e+06u as=3.6e+11p ps=2.72e+06u
-M1002 VGND A2 a_251_74# VNB nlowvt w=640000u l=150000u
-+  ad=5.626e+11p pd=4.44e+06u as=0p ps=0u
-M1003 VPWR a_83_264# X VPB pshort w=1.12e+06u l=180000u
-+  ad=7.996e+11p pd=5.76e+06u as=3.136e+11p ps=2.8e+06u
-M1004 VPWR B1 a_551_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_251_368# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1006 a_83_264# B2 a_251_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_83_264# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1008 a_251_74# A3 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_335_368# A2 a_251_368# VPB pshort w=1e+06u l=180000u
-+  ad=3.6e+11p pd=2.72e+06u as=0p ps=0u
-M1010 a_251_74# A1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_83_264# A3 a_335_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_251_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 X a_83_264# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VGND A3 a_251_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_335_368# A3 a_83_264# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_551_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_251_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 X a_83_264# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_251_368# A2 a_335_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_83_264# B2 a_551_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 VGND A1 a_251_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_251_74# B2 a_83_264# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 a_83_264# B1 a_251_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/o32a/sky130_fd_sc_ms__o32a_2.cdl b/cells/o32a/sky130_fd_sc_ms__o32a_2.cdl
index 7478c36..7940eb8 100644
--- a/cells/o32a/sky130_fd_sc_ms__o32a_2.cdl
+++ b/cells/o32a/sky130_fd_sc_ms__o32a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__o32a_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 sndA2 A3 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 sndB1 B2 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 y B2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o32a_2
diff --git a/cells/o32a/sky130_fd_sc_ms__o32a_2.netlist.tsv b/cells/o32a/sky130_fd_sc_ms__o32a_2.netlist.tsv
index 8f0fcdb..f7b9d2c 100644
--- a/cells/o32a/sky130_fd_sc_ms__o32a_2.netlist.tsv
+++ b/cells/o32a/sky130_fd_sc_ms__o32a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__o32a_2	A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32a/sky130_fd_sc_ms__o32a_2.spice b/cells/o32a/sky130_fd_sc_ms__o32a_2.spice
index 3fce910..74802f7 100644
--- a/cells/o32a/sky130_fd_sc_ms__o32a_2.spice
+++ b/cells/o32a/sky130_fd_sc_ms__o32a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__o32a_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_433_368# A2 a_349_368# VPB pshort w=1e+06u l=180000u
-+  ad=3.6e+11p pd=2.72e+06u as=2.4e+11p ps=2.48e+06u
-M1001 a_83_264# B2 a_349_74# VNB nlowvt w=740000u l=150000u
-+  ad=6.771e+11p pd=3.31e+06u as=7.289e+11p ps=6.41e+06u
-M1002 a_349_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=9.62e+11p ps=7.04e+06u
-M1003 a_655_368# B2 a_83_264# VPB pshort w=1e+06u l=180000u
-+  ad=3.9e+11p pd=2.78e+06u as=3.9e+11p ps=2.78e+06u
-M1004 X a_83_264# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=1.1436e+12p ps=8.64e+06u
-M1005 VPWR a_83_264# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_83_264# A3 a_433_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_349_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B1 a_655_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_349_74# B1 a_83_264# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_83_264# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1011 VGND A2 a_349_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_349_368# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_83_264# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_83_264# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_83_264# B2 a_655_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 X a_83_264# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_83_264# B1 a_349_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_349_368# A2 a_433_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 VGND A1 a_349_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR a_83_264# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_349_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VPWR A1 a_349_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 a_349_74# B2 a_83_264# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_655_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 VGND a_83_264# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VGND A3 a_349_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_433_368# A3 a_83_264# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/o32a/sky130_fd_sc_ms__o32a_4.cdl b/cells/o32a/sky130_fd_sc_ms__o32a_4.cdl
index d5ddc50..a22b82d 100644
--- a/cells/o32a/sky130_fd_sc_ms__o32a_4.cdl
+++ b/cells/o32a/sky130_fd_sc_ms__o32a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__o32a_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA2 sndA2 A3 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPB1 sndB1 B2 VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=2 w=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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 y B2 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o32a_4
diff --git a/cells/o32a/sky130_fd_sc_ms__o32a_4.netlist.tsv b/cells/o32a/sky130_fd_sc_ms__o32a_4.netlist.tsv
index 9c03da8..aed7c16 100644
--- a/cells/o32a/sky130_fd_sc_ms__o32a_4.netlist.tsv
+++ b/cells/o32a/sky130_fd_sc_ms__o32a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__o32a_4	A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32a/sky130_fd_sc_ms__o32a_4.spice b/cells/o32a/sky130_fd_sc_ms__o32a_4.spice
index bed2885..e810619 100644
--- a/cells/o32a/sky130_fd_sc_ms__o32a_4.spice
+++ b/cells/o32a/sky130_fd_sc_ms__o32a_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__o32a_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_961_392# A3 a_83_256# VPB pshort w=1e+06u l=180000u
-+  ad=8.3e+11p pd=7.66e+06u as=5.6e+11p ps=5.12e+06u
-M1001 a_1237_392# A2 a_961_392# VPB pshort w=1e+06u l=180000u
-+  ad=7.3e+11p pd=5.46e+06u as=0p ps=0u
-M1002 a_564_74# A3 VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.2032e+12p pd=1.144e+07u as=1.5408e+12p ps=1.279e+07u
-M1003 VPWR a_83_256# X VPB pshort w=1.12e+06u l=180000u
-+  ad=1.7126e+12p pd=1.394e+07u as=7.392e+11p ps=5.8e+06u
-M1004 a_564_74# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A1 a_564_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_83_256# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_564_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_83_256# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_83_256# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_83_256# B1 a_564_74# VNB nlowvt w=640000u l=150000u
-+  ad=4.032e+11p pd=3.82e+06u as=0p ps=0u
-M1011 a_1237_392# A1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A3 a_564_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_961_392# A2 a_1237_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_564_74# A1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_83_256# VGND VNB nlowvt w=740000u l=150000u
-+  ad=5.069e+11p pd=4.33e+06u as=0p ps=0u
-M1016 a_83_256# B2 a_537_388# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=6.8e+11p ps=5.36e+06u
-M1017 a_83_256# A3 a_961_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_537_388# B1 VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_537_388# B2 a_83_256# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_83_256# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_564_74# B2 a_83_256# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_83_256# B2 a_564_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR B1 a_537_388# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_83_256# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_564_74# B1 a_83_256# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR A1 a_1237_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_83_256# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1237_392# A2 a_961_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_961_392# A2 a_1237_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_83_256# B2 a_537_388# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 VGND A1 a_564_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_1237_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_537_388# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_83_256# B2 a_564_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X7 VGND A3 a_564_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 X a_83_256# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VPWR B1 a_537_388# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_961_392# A3 a_83_256# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 VGND a_83_256# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 X a_83_256# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VPWR a_83_256# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_564_74# B2 a_83_256# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 VPWR A1 a_1237_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 X a_83_256# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_83_256# A3 a_961_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 VPWR a_83_256# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_537_388# B2 a_83_256# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X20 a_564_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X21 a_83_256# B1 a_564_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X22 VGND A2 a_564_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X23 VGND a_83_256# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_564_74# B1 a_83_256# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X25 a_564_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X26 a_564_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X27 X a_83_256# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o32ai/sky130_fd_sc_ms__o32ai_1.cdl b/cells/o32ai/sky130_fd_sc_ms__o32ai_1.cdl
index 8174eef..84dee5b 100644
--- a/cells/o32ai/sky130_fd_sc_ms__o32ai_1.cdl
+++ b/cells/o32ai/sky130_fd_sc_ms__o32ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o32ai_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 Y B2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o32ai_1
diff --git a/cells/o32ai/sky130_fd_sc_ms__o32ai_1.netlist.tsv b/cells/o32ai/sky130_fd_sc_ms__o32ai_1.netlist.tsv
index efecbfe..96565e5 100644
--- a/cells/o32ai/sky130_fd_sc_ms__o32ai_1.netlist.tsv
+++ b/cells/o32ai/sky130_fd_sc_ms__o32ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o32ai_1	A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32ai/sky130_fd_sc_ms__o32ai_1.spice b/cells/o32ai/sky130_fd_sc_ms__o32ai_1.spice
index bcf0d5a..b53a6d1 100644
--- a/cells/o32ai/sky130_fd_sc_ms__o32ai_1.spice
+++ b/cells/o32ai/sky130_fd_sc_ms__o32ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__o32ai_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 VGND A3 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=5.439e+11p pd=4.43e+06u as=6.771e+11p ps=6.27e+06u
-M1001 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_345_368# A3 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=4.368e+11p pd=3.02e+06u as=5.264e+11p ps=3.18e+06u
-M1003 a_27_74# B2 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.329e+11p ps=2.65e+06u
-M1004 VPWR A1 a_459_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.72e+11p pd=5.68e+06u as=4.368e+11p ps=3.02e+06u
-M1005 a_459_368# A2 a_345_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_131_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.688e+11p pd=2.72e+06u as=0p ps=0u
-M1007 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B2 a_131_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_131_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_345_368# A2 a_459_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_27_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_459_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 Y B2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 Y A3 a_345_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VPWR B1 a_131_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o32ai/sky130_fd_sc_ms__o32ai_2.cdl b/cells/o32ai/sky130_fd_sc_ms__o32ai_2.cdl
index 0ec6899..b3340ea 100644
--- a/cells/o32ai/sky130_fd_sc_ms__o32ai_2.cdl
+++ b/cells/o32ai/sky130_fd_sc_ms__o32ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o32ai_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 Y B2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o32ai_2
diff --git a/cells/o32ai/sky130_fd_sc_ms__o32ai_2.netlist.tsv b/cells/o32ai/sky130_fd_sc_ms__o32ai_2.netlist.tsv
index 245c678..ea7a3ca 100644
--- a/cells/o32ai/sky130_fd_sc_ms__o32ai_2.netlist.tsv
+++ b/cells/o32ai/sky130_fd_sc_ms__o32ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o32ai_2	A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32ai/sky130_fd_sc_ms__o32ai_2.spice b/cells/o32ai/sky130_fd_sc_ms__o32ai_2.spice
index db348cc..2e09606 100644
--- a/cells/o32ai/sky130_fd_sc_ms__o32ai_2.spice
+++ b/cells/o32ai/sky130_fd_sc_ms__o32ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__o32ai_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_771_368# A2 a_499_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.104e+11p pd=5.57e+06u as=9.296e+11p ps=8.38e+06u
-M1001 a_499_368# A2 a_771_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y B2 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=9.296e+11p ps=8.38e+06u
-M1003 a_27_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR B1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=9.856e+11p pd=8.48e+06u as=0p ps=0u
-M1005 a_27_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_771_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.4208e+12p pd=1.272e+07u as=1.5162e+12p ps=8.64e+06u
-M1008 VGND A3 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_771_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.662e+11p ps=4.22e+06u
-M1012 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y B2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_74# B2 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A3 a_499_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_499_368# A3 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VGND A3 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 Y B2 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR A1 a_771_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 Y B2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR B1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_499_368# A3 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_499_368# A2 a_771_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_27_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_771_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_27_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_27_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 Y A3 a_499_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_771_368# A2 a_499_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_27_74# B2 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o32ai/sky130_fd_sc_ms__o32ai_4.cdl b/cells/o32ai/sky130_fd_sc_ms__o32ai_4.cdl
index 9d4444f..a3a55e1 100644
--- a/cells/o32ai/sky130_fd_sc_ms__o32ai_4.cdl
+++ b/cells/o32ai/sky130_fd_sc_ms__o32ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o32ai_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 Y B2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o32ai_4
diff --git a/cells/o32ai/sky130_fd_sc_ms__o32ai_4.netlist.tsv b/cells/o32ai/sky130_fd_sc_ms__o32ai_4.netlist.tsv
index b28839e..ec84769 100644
--- a/cells/o32ai/sky130_fd_sc_ms__o32ai_4.netlist.tsv
+++ b/cells/o32ai/sky130_fd_sc_ms__o32ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o32ai_4	A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32ai/sky130_fd_sc_ms__o32ai_4.spice b/cells/o32ai/sky130_fd_sc_ms__o32ai_4.spice
index 7e758a4..f243f00 100644
--- a/cells/o32ai/sky130_fd_sc_ms__o32ai_4.spice
+++ b/cells/o32ai/sky130_fd_sc_ms__o32ai_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ms__o32ai_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_27_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=2.9524e+12p pd=2.427e+07u as=9.435e+11p ps=8.47e+06u
-M1001 a_27_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.7051e+12p ps=1.361e+07u
-M1002 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_1333_368# A2 a_861_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2656e+12p pd=1.122e+07u as=1.7584e+12p ps=1.434e+07u
-M1004 Y B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A3 a_861_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2096e+12p pd=1.112e+07u as=0p ps=0u
-M1007 a_861_368# A2 a_1333_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_861_368# A2 a_1333_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1333_368# A2 a_861_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.5344e+12p pd=1.394e+07u as=1.6576e+12p ps=1.416e+07u
-M1013 a_861_368# A3 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y B2 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B2 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_368# B2 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1333_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_74# B2 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR B1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1333_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_27_368# B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR A1 a_1333_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR B1 a_27_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A3 a_861_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y B2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y B2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_27_74# B2 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND A3 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND A2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR A1 a_1333_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_27_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_861_368# A3 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND A3 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_27_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# B2 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VPWR B1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_1333_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_861_368# A3 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 Y B2 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 Y A3 a_861_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_1333_368# A2 a_861_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_27_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_861_368# A3 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 Y B2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 Y B2 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VGND A3 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 VPWR B1 a_27_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 VPWR A1 a_1333_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_861_368# A2 a_1333_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 Y B2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 a_27_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 a_1333_368# A2 a_861_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 a_861_368# A2 a_1333_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X29 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X30 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 a_27_368# B2 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 VPWR A1 a_1333_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X33 Y A3 a_861_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X34 a_27_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X35 a_27_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X36 a_27_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X37 a_1333_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X38 VGND A3 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X39 a_27_74# B2 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o41a/sky130_fd_sc_ms__o41a_1.cdl b/cells/o41a/sky130_fd_sc_ms__o41a_1.cdl
index 33b8cb9..57b79b1 100644
--- a/cells/o41a/sky130_fd_sc_ms__o41a_1.cdl
+++ b/cells/o41a/sky130_fd_sc_ms__o41a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__o41a_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA3 sndA3 A4 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 sndA3 A4 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA3 pndA A4 VNB nlowvt m=1 w=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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA3 pndA A4 VNB nfet_01v8_lvt m=1 w=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_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o41a_1
diff --git a/cells/o41a/sky130_fd_sc_ms__o41a_1.netlist.tsv b/cells/o41a/sky130_fd_sc_ms__o41a_1.netlist.tsv
index fbe7be3..837c5a5 100644
--- a/cells/o41a/sky130_fd_sc_ms__o41a_1.netlist.tsv
+++ b/cells/o41a/sky130_fd_sc_ms__o41a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__o41a_1	A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	sndA3	A4	y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41a/sky130_fd_sc_ms__o41a_1.spice b/cells/o41a/sky130_fd_sc_ms__o41a_1.spice
index d638342..56c05bf 100644
--- a/cells/o41a/sky130_fd_sc_ms__o41a_1.spice
+++ b/cells/o41a/sky130_fd_sc_ms__o41a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__o41a_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 VPWR a_83_270# X VPB pshort w=1.12e+06u l=180000u
-+  ad=1.3554e+12p pd=7.11e+06u as=3.136e+11p ps=2.8e+06u
-M1001 VGND A4 a_326_74# VNB nlowvt w=640000u l=150000u
-+  ad=8.899e+11p pd=6.71e+06u as=6.24e+11p ps=5.79e+06u
-M1002 a_83_270# B1 VPWR VPB pshort w=840000u l=180000u
-+  ad=3.7225e+11p pd=2.95e+06u as=0p ps=0u
-M1003 a_446_368# A4 a_83_270# VPB pshort w=1.12e+06u l=180000u
-+  ad=2.688e+11p pd=2.72e+06u as=0p ps=0u
-M1004 a_326_74# B1 a_83_270# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1005 a_644_368# A2 a_530_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=4.368e+11p pd=3.02e+06u as=4.368e+11p ps=3.02e+06u
-M1006 VGND A2 a_326_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_530_368# A3 a_446_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_326_74# A1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_644_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_83_270# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1011 a_326_74# A3 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_446_368# A3 a_530_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VGND A3 a_326_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_326_74# A4 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_644_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_83_270# A4 a_446_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_83_270# B1 a_326_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 X a_83_270# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_530_368# A2 a_644_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VPWR B1 a_83_270# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 a_326_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 VGND A1 a_326_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 X a_83_270# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o41a/sky130_fd_sc_ms__o41a_2.cdl b/cells/o41a/sky130_fd_sc_ms__o41a_2.cdl
index 730c0ba..4d43b44 100644
--- a/cells/o41a/sky130_fd_sc_ms__o41a_2.cdl
+++ b/cells/o41a/sky130_fd_sc_ms__o41a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__o41a_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA3 sndA3 A4 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 sndA3 A4 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=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 pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA3 pndA A4 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA3 pndA A4 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o41a_2
diff --git a/cells/o41a/sky130_fd_sc_ms__o41a_2.netlist.tsv b/cells/o41a/sky130_fd_sc_ms__o41a_2.netlist.tsv
index 2586c49..1fda09c 100644
--- a/cells/o41a/sky130_fd_sc_ms__o41a_2.netlist.tsv
+++ b/cells/o41a/sky130_fd_sc_ms__o41a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__o41a_2	A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	sndA3	A4	y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	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	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41a/sky130_fd_sc_ms__o41a_2.spice b/cells/o41a/sky130_fd_sc_ms__o41a_2.spice
index fbdd855..89e64a3 100644
--- a/cells/o41a/sky130_fd_sc_ms__o41a_2.spice
+++ b/cells/o41a/sky130_fd_sc_ms__o41a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__o41a_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 a_27_74# A4 VGND VNB nlowvt w=740000u l=150000u
-+  ad=6.364e+11p pd=6.16e+06u as=1.2691e+12p ps=9.35e+06u
-M1001 X a_431_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1002 a_119_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.688e+11p pd=2.72e+06u as=1.6872e+12p ps=9.9e+06u
-M1003 VGND A3 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR B1 a_431_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=4.236e+11p ps=3.02e+06u
-M1005 a_203_368# A2 a_119_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=4.368e+11p pd=3.02e+06u as=0p ps=0u
-M1006 a_431_368# A4 a_317_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=4.368e+11p ps=3.02e+06u
-M1007 VGND a_431_368# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_317_368# A3 a_203_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_431_368# B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.627e+11p pd=2.19e+06u as=0p ps=0u
-M1010 X a_431_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1011 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_431_368# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_431_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_27_74# B1 a_431_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_431_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 X a_431_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VGND A4 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_203_368# A3 a_317_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VPWR a_431_368# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_27_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR A1 a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_317_368# A4 a_431_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_119_368# A2 a_203_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VGND a_431_368# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o41a/sky130_fd_sc_ms__o41a_4.cdl b/cells/o41a/sky130_fd_sc_ms__o41a_4.cdl
index 48c0b85..bf5287d 100644
--- a/cells/o41a/sky130_fd_sc_ms__o41a_4.cdl
+++ b/cells/o41a/sky130_fd_sc_ms__o41a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__o41a_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA3 sndA3 A4 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 sndA3 A4 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA3 pndA A4 VNB nlowvt m=2 w=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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA3 pndA A4 VNB nfet_01v8_lvt m=2 w=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_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o41a_4
diff --git a/cells/o41a/sky130_fd_sc_ms__o41a_4.netlist.tsv b/cells/o41a/sky130_fd_sc_ms__o41a_4.netlist.tsv
index 2c17945..4b91caf 100644
--- a/cells/o41a/sky130_fd_sc_ms__o41a_4.netlist.tsv
+++ b/cells/o41a/sky130_fd_sc_ms__o41a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__o41a_4	A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	sndA3	A4	y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41a/sky130_fd_sc_ms__o41a_4.spice b/cells/o41a/sky130_fd_sc_ms__o41a_4.spice
index d3e984c..861b5ef 100644
--- a/cells/o41a/sky130_fd_sc_ms__o41a_4.spice
+++ b/cells/o41a/sky130_fd_sc_ms__o41a_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__o41a_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 a_523_124# A4 VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.1456e+12p pd=1.126e+07u as=1.69995e+12p ps=1.463e+07u
-M1001 a_1216_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.608e+11p pd=5.66e+06u as=1.5693e+12p ps=1.363e+07u
-M1002 a_762_368# A2 a_1216_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=9.856e+11p pd=8.48e+06u as=0p ps=0u
-M1003 X a_110_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1004 a_523_124# A3 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_523_124# B1 a_110_48# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1006 VPWR a_110_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_110_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_523_124# A2 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_110_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_110_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1011 a_110_48# B1 VPWR VPB pshort w=840000u l=180000u
-+  ad=5.404e+11p pd=5.02e+06u as=0p ps=0u
-M1012 a_523_124# A1 VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A1 a_523_124# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR B1 a_110_48# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_854_368# A3 a_762_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1016 a_110_48# B1 a_523_124# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_110_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A3 a_523_124# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_110_48# A4 a_854_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_110_48# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_854_368# A4 a_110_48# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A2 a_523_124# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_762_368# A3 a_854_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_110_48# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1216_368# A2 a_762_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR A1 a_1216_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A4 a_523_124# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_110_48# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_762_368# A2 a_1216_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VPWR a_110_48# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_110_48# B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X4 VGND A3 a_523_124# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_854_368# A4 a_110_48# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VGND a_110_48# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_523_124# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_523_124# A4 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 VGND A2 a_523_124# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_110_48# A4 a_854_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VGND A1 a_523_124# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 a_523_124# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 a_854_368# A3 a_762_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 X a_110_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 X a_110_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 X a_110_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VPWR B1 a_110_48# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X18 a_1216_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 X a_110_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 VPWR A1 a_1216_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 a_762_368# A3 a_854_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_523_124# B1 a_110_48# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X23 a_110_48# B1 a_523_124# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X24 VGND A4 a_523_124# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X25 a_523_124# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X26 a_1216_368# A2 a_762_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 VGND a_110_48# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o41ai/sky130_fd_sc_ms__o41ai_1.cdl b/cells/o41ai/sky130_fd_sc_ms__o41ai_1.cdl
index 3f7472d..39b4eb3 100644
--- a/cells/o41ai/sky130_fd_sc_ms__o41ai_1.cdl
+++ b/cells/o41ai/sky130_fd_sc_ms__o41ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o41ai_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA3 sndA3 A4 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 sndA3 A4 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA3 pndA A4 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA3 pndA A4 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o41ai_1
diff --git a/cells/o41ai/sky130_fd_sc_ms__o41ai_1.netlist.tsv b/cells/o41ai/sky130_fd_sc_ms__o41ai_1.netlist.tsv
index 9615492..79ce991 100644
--- a/cells/o41ai/sky130_fd_sc_ms__o41ai_1.netlist.tsv
+++ b/cells/o41ai/sky130_fd_sc_ms__o41ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o41ai_1	A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	sndA3	A4	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41ai/sky130_fd_sc_ms__o41ai_1.spice b/cells/o41ai/sky130_fd_sc_ms__o41ai_1.spice
index 88c027e..7f87a59 100644
--- a/cells/o41ai/sky130_fd_sc_ms__o41ai_1.spice
+++ b/cells/o41ai/sky130_fd_sc_ms__o41ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__o41ai_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 a_157_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=7.104e+11p pd=6.36e+06u as=6.327e+11p ps=4.67e+06u
-M1001 a_475_368# A2 a_361_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=4.368e+11p pd=3.02e+06u as=4.368e+11p ps=3.02e+06u
-M1002 a_361_368# A3 a_263_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.472e+11p ps=2.86e+06u
-M1003 a_157_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A1 a_475_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=8.736e+11p pd=6.04e+06u as=0p ps=0u
-M1005 a_263_368# A4 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.584e+11p ps=2.88e+06u
-M1006 Y B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_157_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A4 a_157_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_157_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
+X0 a_361_368# A2 a_475_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_157_74# A4 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Y B1 a_157_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_157_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 Y A4 a_263_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VGND A3 a_157_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_475_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VGND A1 a_157_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_263_368# A3 a_361_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/o41ai/sky130_fd_sc_ms__o41ai_2.cdl b/cells/o41ai/sky130_fd_sc_ms__o41ai_2.cdl
index 639c056..ad4cd65 100644
--- a/cells/o41ai/sky130_fd_sc_ms__o41ai_2.cdl
+++ b/cells/o41ai/sky130_fd_sc_ms__o41ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o41ai_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA3 sndA3 A4 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 sndA3 A4 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA3 pndA A4 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA3 pndA A4 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o41ai_2
diff --git a/cells/o41ai/sky130_fd_sc_ms__o41ai_2.netlist.tsv b/cells/o41ai/sky130_fd_sc_ms__o41ai_2.netlist.tsv
index 317ff4f..5f35684 100644
--- a/cells/o41ai/sky130_fd_sc_ms__o41ai_2.netlist.tsv
+++ b/cells/o41ai/sky130_fd_sc_ms__o41ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o41ai_2	A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	sndA3	A4	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41ai/sky130_fd_sc_ms__o41ai_2.spice b/cells/o41ai/sky130_fd_sc_ms__o41ai_2.spice
index 6cf5ae2..026364e 100644
--- a/cells/o41ai/sky130_fd_sc_ms__o41ai_2.spice
+++ b/cells/o41ai/sky130_fd_sc_ms__o41ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__o41ai_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 a_314_368# A3 a_610_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.0472e+12p pd=8.59e+06u as=6.048e+11p ps=5.56e+06u
-M1001 VPWR A1 a_807_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=9.016e+11p pd=8.33e+06u as=9.072e+11p ps=8.34e+06u
-M1002 a_132_74# A4 VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.4245e+12p pd=1.273e+07u as=1.0397e+12p ps=8.73e+06u
-M1003 a_807_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A4 a_132_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_132_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1006 VGND A3 a_132_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_132_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A4 a_314_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1009 a_132_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_314_368# A4 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_132_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_610_368# A2 a_807_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A1 a_132_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_807_368# A2 a_610_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A2 a_132_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y B1 a_132_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_610_368# A3 a_314_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_807_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VGND A1 a_132_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_132_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_132_74# A4 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_314_368# A4 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_610_368# A3 a_314_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_807_368# A2 a_610_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 Y B1 a_132_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_132_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR A1 a_807_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VGND A2 a_132_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 Y A4 a_314_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_132_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_314_368# A3 a_610_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_610_368# A2 a_807_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VGND A4 a_132_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 VGND A3 a_132_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_132_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/o41ai/sky130_fd_sc_ms__o41ai_4.cdl b/cells/o41ai/sky130_fd_sc_ms__o41ai_4.cdl
index c99548e..e90a844 100644
--- a/cells/o41ai/sky130_fd_sc_ms__o41ai_4.cdl
+++ b/cells/o41ai/sky130_fd_sc_ms__o41ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__o41ai_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMPA1 sndA1 A2 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA3 sndA3 A4 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 sndA3 A4 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA3 pndA A4 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA3 pndA A4 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__o41ai_4
diff --git a/cells/o41ai/sky130_fd_sc_ms__o41ai_4.netlist.tsv b/cells/o41ai/sky130_fd_sc_ms__o41ai_4.netlist.tsv
index dba2fab..728f225 100644
--- a/cells/o41ai/sky130_fd_sc_ms__o41ai_4.netlist.tsv
+++ b/cells/o41ai/sky130_fd_sc_ms__o41ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__o41ai_4	A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	sndA3	A4	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41ai/sky130_fd_sc_ms__o41ai_4.spice b/cells/o41ai/sky130_fd_sc_ms__o41ai_4.spice
index f8852b6..a10a63d 100644
--- a/cells/o41ai/sky130_fd_sc_ms__o41ai_4.spice
+++ b/cells/o41ai/sky130_fd_sc_ms__o41ai_4.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_ms__o41ai_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 VGND A4 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.1756e+12p pd=1.772e+07u as=2.3976e+12p ps=2.276e+07u
-M1001 VGND A3 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_339_368# A3 a_791_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.5344e+12p pd=1.394e+07u as=1.3216e+12p ps=1.132e+07u
-M1004 VPWR B1 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=1.344e+12p pd=1.136e+07u as=1.0192e+12p ps=8.54e+06u
-M1005 a_27_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A4 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.662e+11p ps=4.22e+06u
-M1010 Y B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_74# A2 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_74# A4 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_791_368# A2 a_1191_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=1.5344e+12p ps=1.394e+07u
-M1014 VGND A2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A4 a_339_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1191_368# A2 a_791_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_74# A4 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_339_368# A4 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_791_368# A2 a_1191_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A4 a_339_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_339_368# A3 a_791_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1191_368# A2 a_791_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_339_368# A4 Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_791_368# A3 a_339_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR A1 a_1191_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1191_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A2 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_791_368# A3 a_339_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y B1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_74# B1 Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_27_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND A1 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_27_74# A1 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_27_74# A3 VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR A1 a_1191_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1191_368# A1 VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND A3 a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 Y A4 a_339_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VGND A3 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_339_368# A3 a_791_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 Y A4 a_339_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_791_368# A3 a_339_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_1191_368# A2 a_791_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_27_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_1191_368# A2 a_791_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_1191_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 VGND A4 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_339_368# A4 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_791_368# A3 a_339_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 a_339_368# A4 Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 VPWR A1 a_1191_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_27_74# A4 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_1191_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 VGND A4 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 VGND A3 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 a_339_368# A3 a_791_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_27_74# A4 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X30 a_791_368# A2 a_1191_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X31 a_791_368# A2 a_1191_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X35 VPWR A1 a_1191_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X36 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X37 a_27_74# A3 VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_ms__or2_1.cdl b/cells/or2/sky130_fd_sc_ms__or2_1.cdl
index c95a8ac..0c62c56 100644
--- a/cells/or2/sky130_fd_sc_ms__or2_1.cdl
+++ b/cells/or2/sky130_fd_sc_ms__or2_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__or2_1 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or2_1
diff --git a/cells/or2/sky130_fd_sc_ms__or2_1.netlist.tsv b/cells/or2/sky130_fd_sc_ms__or2_1.netlist.tsv
index 34f6ff8..d403003 100644
--- a/cells/or2/sky130_fd_sc_ms__or2_1.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_ms__or2_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__or2_1	A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	y	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2/sky130_fd_sc_ms__or2_1.spice b/cells/or2/sky130_fd_sc_ms__or2_1.spice
index d98fdc6..bf49b4a 100644
--- a/cells/or2/sky130_fd_sc_ms__or2_1.spice
+++ b/cells/or2/sky130_fd_sc_ms__or2_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ms__or2_1 A B VGND VNB VPB VPWR X
-M1000 X a_63_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=5.7345e+11p ps=4.42e+06u
-M1001 a_155_368# B a_63_368# VPB pshort w=840000u l=180000u
-+  ad=2.016e+11p pd=2.16e+06u as=2.352e+11p ps=2.24e+06u
-M1002 VGND A a_63_368# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=2.6125e+11p ps=2.05e+06u
-M1003 a_63_368# B VGND VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_63_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=6.398e+11p ps=3.46e+06u
-M1005 VPWR A a_155_368# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_63_368# B a_155_368# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 VGND B a_63_368# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X2 VPWR a_63_368# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_63_368# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X4 a_155_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 VGND a_63_368# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_ms__or2_2.cdl b/cells/or2/sky130_fd_sc_ms__or2_2.cdl
index 71826e8..be734fe 100644
--- a/cells/or2/sky130_fd_sc_ms__or2_2.cdl
+++ b/cells/or2/sky130_fd_sc_ms__or2_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__or2_2 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or2_2
diff --git a/cells/or2/sky130_fd_sc_ms__or2_2.netlist.tsv b/cells/or2/sky130_fd_sc_ms__or2_2.netlist.tsv
index b9d09ab..dc75332 100644
--- a/cells/or2/sky130_fd_sc_ms__or2_2.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_ms__or2_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__or2_2	A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2/sky130_fd_sc_ms__or2_2.spice b/cells/or2/sky130_fd_sc_ms__or2_2.spice
index 9a3c7ce..ee1d484 100644
--- a/cells/or2/sky130_fd_sc_ms__or2_2.spice
+++ b/cells/or2/sky130_fd_sc_ms__or2_2.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__or2_2 A B VGND VNB VPB VPWR X
-M1000 VPWR A a_117_368# VPB pshort w=1e+06u l=180000u
-+  ad=7.072e+11p pd=5.76e+06u as=2.1e+11p ps=2.42e+06u
-M1001 VGND a_27_368# X VNB nlowvt w=740000u l=150000u
-+  ad=6.823e+11p pd=6.18e+06u as=2.072e+11p ps=2.04e+06u
-M1002 X a_27_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.248e+11p pd=2.82e+06u as=0p ps=0u
-M1003 a_27_368# B VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1004 a_117_368# B a_27_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1005 VGND A a_27_368# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_27_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_27_368# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_27_368# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 X a_27_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_27_368# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 VGND B a_27_368# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_117_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 X a_27_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_27_368# B a_117_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VPWR a_27_368# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_ms__or2_4.cdl b/cells/or2/sky130_fd_sc_ms__or2_4.cdl
index 0fda26e..cb4f936 100644
--- a/cells/or2/sky130_fd_sc_ms__or2_4.cdl
+++ b/cells/or2/sky130_fd_sc_ms__or2_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ms__or2_4 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=2 w=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 pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or2_4
diff --git a/cells/or2/sky130_fd_sc_ms__or2_4.netlist.tsv b/cells/or2/sky130_fd_sc_ms__or2_4.netlist.tsv
index e18eee5..dbb442c 100644
--- a/cells/or2/sky130_fd_sc_ms__or2_4.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_ms__or2_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ms__or2_4	A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	y	VPB	pfet_01v8	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	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2/sky130_fd_sc_ms__or2_4.spice b/cells/or2/sky130_fd_sc_ms__or2_4.spice
index a764c33..840d3fc 100644
--- a/cells/or2/sky130_fd_sc_ms__or2_4.spice
+++ b/cells/or2/sky130_fd_sc_ms__or2_4.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__or2_4 A B VGND VNB VPB VPWR X
-M1000 VGND B a_83_260# VNB nlowvt w=740000u l=150000u
-+  ad=1.6058e+12p pd=1.026e+07u as=2.479e+11p ps=2.15e+06u
-M1001 X a_83_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=1.3096e+12p ps=1.114e+07u
-M1002 VPWR a_83_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_83_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_83_260# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_496_388# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.9e+11p pd=5.18e+06u as=0p ps=0u
-M1006 VPWR a_83_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_83_260# B a_496_388# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1008 X a_83_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.773e+11p pd=4.25e+06u as=0p ps=0u
-M1009 VGND a_83_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_496_388# B a_83_260# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A a_496_388# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_83_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_83_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VPWR A a_496_388# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_83_260# B a_496_388# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 VGND A a_83_260# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_83_260# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_496_388# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_496_388# B a_83_260# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/or2b/sky130_fd_sc_ms__or2b_1.cdl b/cells/or2b/sky130_fd_sc_ms__or2b_1.cdl
index 06cd9e3..6cd9d02 100644
--- a/cells/or2b/sky130_fd_sc_ms__or2b_1.cdl
+++ b/cells/or2b/sky130_fd_sc_ms__or2b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__or2b_1 A B_N VGND VNB VPB VPWR X
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 B B_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or2b_1
diff --git a/cells/or2b/sky130_fd_sc_ms__or2b_1.netlist.tsv b/cells/or2b/sky130_fd_sc_ms__or2b_1.netlist.tsv
index 79cc928..bc0176a 100644
--- a/cells/or2b/sky130_fd_sc_ms__or2b_1.netlist.tsv
+++ b/cells/or2b/sky130_fd_sc_ms__or2b_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__or2b_1	A:I B_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2b/sky130_fd_sc_ms__or2b_1.spice b/cells/or2b/sky130_fd_sc_ms__or2b_1.spice
index 24961a8..5623adf 100644
--- a/cells/or2b/sky130_fd_sc_ms__or2b_1.spice
+++ b/cells/or2b/sky130_fd_sc_ms__or2b_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__or2b_1 A B_N VGND VNB VPB VPWR X
-M1000 a_264_368# a_27_112# VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=7.357e+11p ps=5.01e+06u
-M1001 VGND A a_264_368# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 X a_264_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=7.218e+11p ps=5.39e+06u
-M1003 VGND B_N a_27_112# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=3.685e+11p ps=2.44e+06u
-M1004 a_356_368# a_27_112# a_264_368# VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=2.8e+11p ps=2.56e+06u
-M1005 VPWR B_N a_27_112# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1006 VPWR A a_356_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_264_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
+X0 a_27_112# B_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X1 VPWR a_264_368# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_264_368# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X3 VGND a_264_368# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_27_112# B_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 a_264_368# a_27_112# a_356_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_356_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VGND a_27_112# a_264_368# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
 .ends
diff --git a/cells/or2b/sky130_fd_sc_ms__or2b_2.cdl b/cells/or2b/sky130_fd_sc_ms__or2b_2.cdl
index 3a5d725..af471a6 100644
--- a/cells/or2b/sky130_fd_sc_ms__or2b_2.cdl
+++ b/cells/or2b/sky130_fd_sc_ms__or2b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__or2b_2 A B_N VGND VNB VPB VPWR X
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 B B_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or2b_2
diff --git a/cells/or2b/sky130_fd_sc_ms__or2b_2.netlist.tsv b/cells/or2b/sky130_fd_sc_ms__or2b_2.netlist.tsv
index 83fafed..6cc19fd 100644
--- a/cells/or2b/sky130_fd_sc_ms__or2b_2.netlist.tsv
+++ b/cells/or2b/sky130_fd_sc_ms__or2b_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__or2b_2	A:I B_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2b/sky130_fd_sc_ms__or2b_2.spice b/cells/or2b/sky130_fd_sc_ms__or2b_2.spice
index 2a2adc8..27fa89a 100644
--- a/cells/or2b/sky130_fd_sc_ms__or2b_2.spice
+++ b/cells/or2b/sky130_fd_sc_ms__or2b_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__or2b_2 A B_N VGND VNB VPB VPWR X
-M1000 a_187_48# a_27_368# a_473_368# VPB pshort w=1e+06u l=180000u
-+  ad=4e+11p pd=2.8e+06u as=2.4e+11p ps=2.48e+06u
-M1001 VPWR B_N a_27_368# VPB pshort w=840000u l=180000u
-+  ad=8.002e+11p pd=5.97e+06u as=2.352e+11p ps=2.24e+06u
-M1002 VGND B_N a_27_368# VNB nlowvt w=550000u l=150000u
-+  ad=9.5555e+11p pd=7.08e+06u as=1.5675e+11p ps=1.67e+06u
-M1003 a_187_48# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=2.208e+11p pd=1.97e+06u as=0p ps=0u
-M1004 X a_187_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1005 VGND a_187_48# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_473_368# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_27_368# a_187_48# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_187_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=5.432e+11p ps=3.21e+06u
-M1009 X a_187_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A a_187_48# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 a_473_368# a_27_368# a_187_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VPWR a_187_48# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 X a_187_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR A a_473_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 VGND a_187_48# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 X a_187_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_27_368# B_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X8 a_27_368# B_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X9 a_187_48# a_27_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/or2b/sky130_fd_sc_ms__or2b_4.cdl b/cells/or2b/sky130_fd_sc_ms__or2b_4.cdl
index e623ea8..5816d55 100644
--- a/cells/or2b/sky130_fd_sc_ms__or2b_4.cdl
+++ b/cells/or2b/sky130_fd_sc_ms__or2b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__or2b_4 A B_N VGND VNB VPB VPWR X
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=2 w=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 pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP1 B B_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or2b_4
diff --git a/cells/or2b/sky130_fd_sc_ms__or2b_4.netlist.tsv b/cells/or2b/sky130_fd_sc_ms__or2b_4.netlist.tsv
index a353447..0f5ff29 100644
--- a/cells/or2b/sky130_fd_sc_ms__or2b_4.netlist.tsv
+++ b/cells/or2b/sky130_fd_sc_ms__or2b_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__or2b_4	A:I B_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2b/sky130_fd_sc_ms__or2b_4.spice b/cells/or2b/sky130_fd_sc_ms__or2b_4.spice
index 85892a2..2f2767b 100644
--- a/cells/or2b/sky130_fd_sc_ms__or2b_4.spice
+++ b/cells/or2b/sky130_fd_sc_ms__or2b_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ms__or2b_4 A B_N VGND VNB VPB VPWR X
-M1000 a_81_296# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=4.672e+11p pd=4.02e+06u as=1.1509e+12p ps=1.032e+07u
-M1001 a_81_296# a_676_48# a_492_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=8.2e+11p ps=7.64e+06u
-M1002 a_492_392# a_676_48# a_81_296# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_492_392# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.5272e+12p ps=1.358e+07u
-M1004 VPWR A a_492_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_81_296# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.329e+11p ps=4.13e+06u
-M1006 a_81_296# a_676_48# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A a_81_296# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_81_296# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1009 VPWR a_81_296# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_81_296# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_81_296# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_81_296# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_81_296# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_676_48# B_N VGND VNB nlowvt w=640000u l=150000u
-+  ad=6.272e+11p pd=3.24e+06u as=0p ps=0u
-M1015 a_676_48# B_N VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1016 VPWR a_81_296# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_676_48# a_81_296# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_81_296# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_492_392# a_676_48# a_81_296# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VPWR a_81_296# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 VPWR A a_492_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 X a_81_296# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VGND a_676_48# a_81_296# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VGND B_N a_676_48# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X7 X a_81_296# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_81_296# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 a_81_296# a_676_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_81_296# a_676_48# a_492_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 X a_81_296# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 X a_81_296# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VGND A a_81_296# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 a_492_392# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X15 VPWR B_N a_676_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 VPWR a_81_296# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VGND a_81_296# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/or3/sky130_fd_sc_ms__or3_1.cdl b/cells/or3/sky130_fd_sc_ms__or3_1.cdl
index 4fc2304..15450ee 100644
--- a/cells/or3/sky130_fd_sc_ms__or3_1.cdl
+++ b/cells/or3/sky130_fd_sc_ms__or3_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__or3_1 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X y VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 y C VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or3_1
diff --git a/cells/or3/sky130_fd_sc_ms__or3_1.netlist.tsv b/cells/or3/sky130_fd_sc_ms__or3_1.netlist.tsv
index 37e0882..a396b3e 100644
--- a/cells/or3/sky130_fd_sc_ms__or3_1.netlist.tsv
+++ b/cells/or3/sky130_fd_sc_ms__or3_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__or3_1	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3/sky130_fd_sc_ms__or3_1.spice b/cells/or3/sky130_fd_sc_ms__or3_1.spice
index c41ebd1..915550b 100644
--- a/cells/or3/sky130_fd_sc_ms__or3_1.spice
+++ b/cells/or3/sky130_fd_sc_ms__or3_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ms__or3_1 A B C VGND VNB VPB VPWR X
-M1000 a_119_368# C a_27_74# VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=2.8e+11p ps=2.56e+06u
-M1001 VGND A a_27_74# VNB nlowvt w=550000u l=150000u
-+  ad=4.71e+11p pd=4.12e+06u as=5.225e+11p ps=4.1e+06u
-M1002 a_203_368# B a_119_368# VPB pshort w=1e+06u l=180000u
-+  ad=3.9e+11p pd=2.78e+06u as=0p ps=0u
-M1003 a_27_74# B VGND VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=7.3e+11p ps=3.64e+06u
-M1005 X a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1006 VPWR A a_203_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND C a_27_74# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_27_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_203_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_27_74# C a_119_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 VPWR a_27_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X5 a_119_368# B a_203_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X7 a_27_74# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
 .ends
diff --git a/cells/or3/sky130_fd_sc_ms__or3_2.cdl b/cells/or3/sky130_fd_sc_ms__or3_2.cdl
index 1d8e289..e2caa3e 100644
--- a/cells/or3/sky130_fd_sc_ms__or3_2.cdl
+++ b/cells/or3/sky130_fd_sc_ms__or3_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__or3_2 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X y VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 y C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or3_2
diff --git a/cells/or3/sky130_fd_sc_ms__or3_2.netlist.tsv b/cells/or3/sky130_fd_sc_ms__or3_2.netlist.tsv
index 49245dd..7b47fb1 100644
--- a/cells/or3/sky130_fd_sc_ms__or3_2.netlist.tsv
+++ b/cells/or3/sky130_fd_sc_ms__or3_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__or3_2	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3/sky130_fd_sc_ms__or3_2.spice b/cells/or3/sky130_fd_sc_ms__or3_2.spice
index b771ef3..14fa375 100644
--- a/cells/or3/sky130_fd_sc_ms__or3_2.spice
+++ b/cells/or3/sky130_fd_sc_ms__or3_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__or3_2 A B C VGND VNB VPB VPWR X
-M1000 VGND a_27_74# X VNB nlowvt w=740000u l=150000u
-+  ad=9.725e+11p pd=7.09e+06u as=2.072e+11p ps=2.04e+06u
-M1001 VPWR A a_237_392# VPB pshort w=1e+06u l=180000u
-+  ad=8.296e+11p pd=6e+06u as=3.9e+11p ps=2.78e+06u
-M1002 a_237_392# B a_153_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1003 a_153_392# C a_27_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1004 X a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1005 VGND A a_27_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=4.064e+11p ps=3.83e+06u
-M1006 VPWR a_27_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_74# B VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND C a_27_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 VPWR a_27_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_153_392# B a_237_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 VGND a_27_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_237_392# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 X a_27_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_27_74# C a_153_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 X a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_27_74# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/or3/sky130_fd_sc_ms__or3_4.cdl b/cells/or3/sky130_fd_sc_ms__or3_4.cdl
index 977ae0e..b3bcfae 100644
--- a/cells/or3/sky130_fd_sc_ms__or3_4.cdl
+++ b/cells/or3/sky130_fd_sc_ms__or3_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ms__or3_4 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X y VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 y C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or3_4
diff --git a/cells/or3/sky130_fd_sc_ms__or3_4.netlist.tsv b/cells/or3/sky130_fd_sc_ms__or3_4.netlist.tsv
index 2471478..a54415f 100644
--- a/cells/or3/sky130_fd_sc_ms__or3_4.netlist.tsv
+++ b/cells/or3/sky130_fd_sc_ms__or3_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ms__or3_4	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3/sky130_fd_sc_ms__or3_4.spice b/cells/or3/sky130_fd_sc_ms__or3_4.spice
index 852583c..e136ff4 100644
--- a/cells/or3/sky130_fd_sc_ms__or3_4.spice
+++ b/cells/or3/sky130_fd_sc_ms__or3_4.spice
@@ -16,38 +16,21 @@
 
 
 .subckt sky130_fd_sc_ms__or3_4 A B C VGND VNB VPB VPWR X
-M1000 X a_305_388# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.181e+11p pd=4.09e+06u as=9.879e+11p ps=8.59e+06u
-M1001 VGND A a_305_388# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.625e+11p ps=4.21e+06u
-M1002 VGND a_305_388# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_305_388# C a_209_388# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=6.25e+11p ps=5.25e+06u
-M1004 X a_305_388# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=1.2816e+12p ps=1.109e+07u
-M1005 a_209_388# C a_305_388# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_119_388# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.9e+11p ps=5.18e+06u
-M1007 VPWR a_305_388# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND C a_305_388# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_119_388# B a_209_388# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_305_388# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_305_388# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_305_388# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_119_388# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_209_388# B a_119_388# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_305_388# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_305_388# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_305_388# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VPWR A a_119_388# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_209_388# C a_305_388# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 VGND B a_305_388# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_305_388# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_209_388# B a_119_388# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 X a_305_388# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_119_388# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 X a_305_388# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_305_388# C a_209_388# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_305_388# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_119_388# B a_209_388# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 X a_305_388# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VGND a_305_388# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VPWR a_305_388# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 VPWR a_305_388# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VGND a_305_388# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/or3b/sky130_fd_sc_ms__or3b_1.cdl b/cells/or3b/sky130_fd_sc_ms__or3b_1.cdl
index 20353e3..bc653da 100644
--- a/cells/or3b/sky130_fd_sc_ms__or3b_1.cdl
+++ b/cells/or3b/sky130_fd_sc_ms__or3b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__or3b_1 A B C_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 C C_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X y VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 y C VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or3b_1
diff --git a/cells/or3b/sky130_fd_sc_ms__or3b_1.netlist.tsv b/cells/or3b/sky130_fd_sc_ms__or3b_1.netlist.tsv
index 3b712f6..57b46fc 100644
--- a/cells/or3b/sky130_fd_sc_ms__or3b_1.netlist.tsv
+++ b/cells/or3b/sky130_fd_sc_ms__or3b_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__or3b_1	A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3b/sky130_fd_sc_ms__or3b_1.spice b/cells/or3b/sky130_fd_sc_ms__or3b_1.spice
index 9a99b74..affc099 100644
--- a/cells/or3b/sky130_fd_sc_ms__or3b_1.spice
+++ b/cells/or3b/sky130_fd_sc_ms__or3b_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__or3b_1 A B C_N VGND VNB VPB VPWR X
-M1000 a_239_74# B VGND VNB nlowvt w=550000u l=150000u
-+  ad=3.3e+11p pd=3.4e+06u as=8.0375e+11p ps=6.43e+06u
-M1001 a_455_391# B a_371_391# VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=2.4e+11p ps=2.48e+06u
-M1002 VGND A a_239_74# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_239_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=7.134e+11p ps=5.37e+06u
-M1004 VGND a_127_74# a_239_74# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A a_455_391# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_239_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1007 a_127_74# C_N VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.595e+11p pd=1.68e+06u as=0p ps=0u
-M1008 a_127_74# C_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.436e+11p pd=2.26e+06u as=0p ps=0u
-M1009 a_371_391# a_127_74# a_239_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
+X0 a_455_391# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VGND B a_239_74# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X2 a_239_74# a_127_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X3 a_239_74# a_127_74# a_371_391# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VPWR C_N a_127_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 VPWR a_239_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_371_391# B a_455_391# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 VGND a_239_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_239_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X9 VGND C_N a_127_74# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
 .ends
diff --git a/cells/or3b/sky130_fd_sc_ms__or3b_2.cdl b/cells/or3b/sky130_fd_sc_ms__or3b_2.cdl
index ac8df21..15c4100 100644
--- a/cells/or3b/sky130_fd_sc_ms__or3b_2.cdl
+++ b/cells/or3b/sky130_fd_sc_ms__or3b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__or3b_2 A B C_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 C C_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X y VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 y C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or3b_2
diff --git a/cells/or3b/sky130_fd_sc_ms__or3b_2.netlist.tsv b/cells/or3b/sky130_fd_sc_ms__or3b_2.netlist.tsv
index 8a6e639..6d64a60 100644
--- a/cells/or3b/sky130_fd_sc_ms__or3b_2.netlist.tsv
+++ b/cells/or3b/sky130_fd_sc_ms__or3b_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__or3b_2	A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3b/sky130_fd_sc_ms__or3b_2.spice b/cells/or3b/sky130_fd_sc_ms__or3b_2.spice
index b635b49..c90221c 100644
--- a/cells/or3b/sky130_fd_sc_ms__or3b_2.spice
+++ b/cells/or3b/sky130_fd_sc_ms__or3b_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__or3b_2 A B C_N VGND VNB VPB VPWR X
-M1000 a_190_260# a_27_368# VGND VNB nlowvt w=640000u l=150000u
-+  ad=4.064e+11p pd=3.83e+06u as=9.1395e+11p ps=6.95e+06u
-M1001 a_461_368# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=9.8195e+11p ps=6.3e+06u
-M1002 VPWR C_N a_27_368# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1003 a_545_368# B a_461_368# VPB pshort w=1e+06u l=180000u
-+  ad=3.6e+11p pd=2.72e+06u as=0p ps=0u
-M1004 X a_190_260# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1005 VGND C_N a_27_368# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1006 VGND B a_190_260# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_190_260# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_190_260# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_190_260# a_27_368# a_545_368# VPB pshort w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1010 X a_190_260# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1011 VPWR a_190_260# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_461_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VPWR a_190_260# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_461_368# B a_545_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 X a_190_260# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_190_260# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_545_368# a_27_368# a_190_260# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_27_368# C_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 a_27_368# C_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X8 VGND A a_190_260# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 X a_190_260# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 VGND a_27_368# a_190_260# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 VGND a_190_260# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/or3b/sky130_fd_sc_ms__or3b_4.cdl b/cells/or3b/sky130_fd_sc_ms__or3b_4.cdl
index 326a96d..1c0a821 100644
--- a/cells/or3b/sky130_fd_sc_ms__or3b_4.cdl
+++ b/cells/or3b/sky130_fd_sc_ms__or3b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__or3b_4 A B C_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 C C_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X y VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 y C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or3b_4
diff --git a/cells/or3b/sky130_fd_sc_ms__or3b_4.netlist.tsv b/cells/or3b/sky130_fd_sc_ms__or3b_4.netlist.tsv
index 6914edb..073143f 100644
--- a/cells/or3b/sky130_fd_sc_ms__or3b_4.netlist.tsv
+++ b/cells/or3b/sky130_fd_sc_ms__or3b_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__or3b_4	A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3b/sky130_fd_sc_ms__or3b_4.spice b/cells/or3b/sky130_fd_sc_ms__or3b_4.spice
index 98305eb..338ddcd 100644
--- a/cells/or3b/sky130_fd_sc_ms__or3b_4.spice
+++ b/cells/or3b/sky130_fd_sc_ms__or3b_4.spice
@@ -16,42 +16,23 @@
 
 
 .subckt sky130_fd_sc_ms__or3b_4 A B C_N VGND VNB VPB VPWR X
-M1000 VPWR A a_220_392# VPB pshort w=1e+06u l=180000u
-+  ad=1.2948e+12p pd=1.112e+07u as=6e+11p ps=5.2e+06u
-M1001 X a_412_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.329e+11p pd=4.13e+06u as=1.64125e+12p ps=1.215e+07u
-M1002 X a_412_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_412_392# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=6.048e+11p ps=5.56e+06u
-M1004 a_412_392# a_27_392# a_310_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.95e+11p pd=2.59e+06u as=6e+11p ps=5.2e+06u
-M1005 VPWR C_N a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.55e+06u
-M1006 a_412_392# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1007 VGND a_412_392# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_310_392# a_27_392# a_412_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_27_392# a_412_392# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_220_392# B a_310_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_220_392# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A a_412_392# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_310_392# B a_220_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_412_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND C_N a_27_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1016 VPWR a_412_392# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_412_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_412_392# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_220_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_310_392# B a_220_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VGND a_412_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_27_392# C_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VGND a_412_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 X a_412_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_310_392# a_27_392# a_412_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_27_392# C_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 VPWR a_412_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VGND B a_412_392# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VPWR a_412_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_412_392# a_27_392# a_310_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 a_220_392# B a_310_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 X a_412_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_412_392# a_27_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_412_392# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 X a_412_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_220_392# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 X a_412_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/or4/sky130_fd_sc_ms__or4_1.cdl b/cells/or4/sky130_fd_sc_ms__or4_1.cdl
index 12c0177..d0e2867 100644
--- a/cells/or4/sky130_fd_sc_ms__or4_1.cdl
+++ b/cells/or4/sky130_fd_sc_ms__or4_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__or4_1 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 X y VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 y C VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 y D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or4_1
diff --git a/cells/or4/sky130_fd_sc_ms__or4_1.netlist.tsv b/cells/or4/sky130_fd_sc_ms__or4_1.netlist.tsv
index 913fecc..bc0a852 100644
--- a/cells/or4/sky130_fd_sc_ms__or4_1.netlist.tsv
+++ b/cells/or4/sky130_fd_sc_ms__or4_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__or4_1	A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4/sky130_fd_sc_ms__or4_1.spice b/cells/or4/sky130_fd_sc_ms__or4_1.spice
index f56c081..123b3f8 100644
--- a/cells/or4/sky130_fd_sc_ms__or4_1.spice
+++ b/cells/or4/sky130_fd_sc_ms__or4_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__or4_1 A B C D VGND VNB VPB VPWR X
-M1000 X a_44_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=5.4e+11p ps=3.26e+06u
-M1001 a_136_392# D a_44_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=2.8e+11p ps=2.56e+06u
-M1002 VGND C a_44_392# VNB nlowvt w=550000u l=150000u
-+  ad=7.822e+11p pd=6.34e+06u as=3.96e+11p ps=3.64e+06u
-M1003 a_44_392# D VGND VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A a_44_392# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_334_392# B a_220_392# VPB pshort w=1e+06u l=180000u
-+  ad=3.9e+11p pd=2.78e+06u as=3.9e+11p ps=2.78e+06u
-M1006 a_44_392# B VGND VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_44_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1008 a_220_392# C a_136_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A a_334_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_136_392# C a_220_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VGND a_44_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VGND B a_44_392# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X3 a_220_392# B a_334_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 VPWR a_44_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_334_392# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_44_392# D a_136_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_44_392# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X8 VGND D a_44_392# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X9 a_44_392# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
 .ends
diff --git a/cells/or4/sky130_fd_sc_ms__or4_2.cdl b/cells/or4/sky130_fd_sc_ms__or4_2.cdl
index 47cfa3b..0998630 100644
--- a/cells/or4/sky130_fd_sc_ms__or4_2.cdl
+++ b/cells/or4/sky130_fd_sc_ms__or4_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__or4_2 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 X y VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 y C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 y D VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or4_2
diff --git a/cells/or4/sky130_fd_sc_ms__or4_2.netlist.tsv b/cells/or4/sky130_fd_sc_ms__or4_2.netlist.tsv
index cfc41ad..1b015d9 100644
--- a/cells/or4/sky130_fd_sc_ms__or4_2.netlist.tsv
+++ b/cells/or4/sky130_fd_sc_ms__or4_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__or4_2	A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4/sky130_fd_sc_ms__or4_2.spice b/cells/or4/sky130_fd_sc_ms__or4_2.spice
index b93eb94..f9ba94b 100644
--- a/cells/or4/sky130_fd_sc_ms__or4_2.spice
+++ b/cells/or4/sky130_fd_sc_ms__or4_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__or4_2 A B C D VGND VNB VPB VPWR X
-M1000 a_261_392# C a_177_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=2.4e+11p ps=2.48e+06u
-M1001 a_345_392# B a_261_392# VPB pshort w=1e+06u l=180000u
-+  ad=4e+11p pd=2.8e+06u as=0p ps=0u
-M1002 a_85_392# B VGND VNB nlowvt w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=1.24458e+12p ps=9.28e+06u
-M1003 X a_85_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1004 a_85_392# D VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A a_85_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C a_85_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_85_392# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_85_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=8.142e+11p ps=5.95e+06u
-M1009 VPWR a_85_392# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_177_392# D a_85_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1011 VPWR A a_345_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_177_392# C a_261_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_261_392# B a_345_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_85_392# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 VPWR a_85_392# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VGND a_85_392# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_345_392# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 X a_85_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VGND D a_85_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 VGND B a_85_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 X a_85_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_85_392# D a_177_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_85_392# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/or4/sky130_fd_sc_ms__or4_4.cdl b/cells/or4/sky130_fd_sc_ms__or4_4.cdl
index bb7908d..50e2dc1 100644
--- a/cells/or4/sky130_fd_sc_ms__or4_4.cdl
+++ b/cells/or4/sky130_fd_sc_ms__or4_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__or4_4 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 X y VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 y C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 y D VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or4_4
diff --git a/cells/or4/sky130_fd_sc_ms__or4_4.netlist.tsv b/cells/or4/sky130_fd_sc_ms__or4_4.netlist.tsv
index 77e64b3..9572b60 100644
--- a/cells/or4/sky130_fd_sc_ms__or4_4.netlist.tsv
+++ b/cells/or4/sky130_fd_sc_ms__or4_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__or4_4	A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4/sky130_fd_sc_ms__or4_4.spice b/cells/or4/sky130_fd_sc_ms__or4_4.spice
index e206ecc..01888e4 100644
--- a/cells/or4/sky130_fd_sc_ms__or4_4.spice
+++ b/cells/or4/sky130_fd_sc_ms__or4_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ms__or4_4 A B C D VGND VNB VPB VPWR X
-M1000 a_83_264# D a_965_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=5.9e+11p ps=5.18e+06u
-M1001 VGND a_83_264# X VNB nlowvt w=740000u l=150000u
-+  ad=2.2402e+12p pd=1.413e+07u as=6.549e+11p ps=4.73e+06u
-M1002 a_965_392# D a_83_264# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_499_392# C a_965_392# VPB pshort w=1e+06u l=180000u
-+  ad=9.3e+11p pd=7.86e+06u as=0p ps=0u
-M1004 a_83_264# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.662e+11p pd=4.22e+06u as=0p ps=0u
-M1005 X a_83_264# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=1.1996e+12p ps=1.092e+07u
-M1006 VPWR a_83_264# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_83_264# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_83_264# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND D a_83_264# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_83_264# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_83_264# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_83_264# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A a_83_264# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_591_392# B a_499_392# VPB pshort w=1e+06u l=180000u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1015 a_83_264# C VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A a_591_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_591_392# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_499_392# B a_591_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_965_392# C a_499_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND C a_83_264# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_83_264# D a_965_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VGND B a_83_264# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_83_264# D VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 X a_83_264# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_591_392# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 X a_83_264# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_83_264# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_965_392# D a_83_264# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 VGND a_83_264# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_591_392# B a_499_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 VGND a_83_264# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VPWR a_83_264# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_965_392# C a_499_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 a_499_392# B a_591_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X15 VPWR A a_591_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 a_499_392# C a_965_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X17 X a_83_264# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 VPWR a_83_264# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 X a_83_264# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/or4b/sky130_fd_sc_ms__or4b_1.cdl b/cells/or4b/sky130_fd_sc_ms__or4b_1.cdl
index efbc927..d65c634 100644
--- a/cells/or4b/sky130_fd_sc_ms__or4b_1.cdl
+++ b/cells/or4b/sky130_fd_sc_ms__or4b_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__or4b_1 A B C D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 D D_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 X y VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 y C VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 y D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or4b_1
diff --git a/cells/or4b/sky130_fd_sc_ms__or4b_1.netlist.tsv b/cells/or4b/sky130_fd_sc_ms__or4b_1.netlist.tsv
index 552fc0f..0ce1403 100644
--- a/cells/or4b/sky130_fd_sc_ms__or4b_1.netlist.tsv
+++ b/cells/or4b/sky130_fd_sc_ms__or4b_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__or4b_1	A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4b/sky130_fd_sc_ms__or4b_1.spice b/cells/or4b/sky130_fd_sc_ms__or4b_1.spice
index 69b27ba..c09d394 100644
--- a/cells/or4b/sky130_fd_sc_ms__or4b_1.spice
+++ b/cells/or4b/sky130_fd_sc_ms__or4b_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ms__or4b_1 A B C D_N VGND VNB VPB VPWR X
-M1000 VGND C a_228_74# VNB nlowvt w=550000u l=150000u
-+  ad=7.8175e+11p pd=6.35e+06u as=6.6275e+11p ps=4.61e+06u
-M1001 VPWR D_N a_27_74# VPB pshort w=840000u l=180000u
-+  ad=8.268e+11p pd=5.6e+06u as=2.352e+11p ps=2.24e+06u
-M1002 X a_228_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1003 a_527_368# B a_443_368# VPB pshort w=1e+06u l=180000u
-+  ad=3.6e+11p pd=2.72e+06u as=2.4e+11p ps=2.48e+06u
-M1004 VPWR A a_527_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_228_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1006 a_228_74# B VGND VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_359_368# a_27_74# a_228_74# VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=2.8e+11p ps=2.56e+06u
-M1008 VGND D_N a_27_74# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1009 a_443_368# C a_359_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_228_74# a_27_74# VGND VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A a_228_74# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_228_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_27_74# D_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 VGND B a_228_74# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X3 a_228_74# a_27_74# a_359_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X4 a_527_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 VGND a_27_74# a_228_74# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X6 a_359_368# C a_443_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_228_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X8 VGND a_228_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_443_368# B a_527_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_228_74# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X11 a_27_74# D_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
 .ends
diff --git a/cells/or4b/sky130_fd_sc_ms__or4b_2.cdl b/cells/or4b/sky130_fd_sc_ms__or4b_2.cdl
index d42c86b..bc50d00 100644
--- a/cells/or4b/sky130_fd_sc_ms__or4b_2.cdl
+++ b/cells/or4b/sky130_fd_sc_ms__or4b_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__or4b_2 A B C D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 D D_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 X y VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 y C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 y D VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or4b_2
diff --git a/cells/or4b/sky130_fd_sc_ms__or4b_2.netlist.tsv b/cells/or4b/sky130_fd_sc_ms__or4b_2.netlist.tsv
index 5f5ff6b..63877a8 100644
--- a/cells/or4b/sky130_fd_sc_ms__or4b_2.netlist.tsv
+++ b/cells/or4b/sky130_fd_sc_ms__or4b_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__or4b_2	A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4b/sky130_fd_sc_ms__or4b_2.spice b/cells/or4b/sky130_fd_sc_ms__or4b_2.spice
index e64036b..72cafa3 100644
--- a/cells/or4b/sky130_fd_sc_ms__or4b_2.spice
+++ b/cells/or4b/sky130_fd_sc_ms__or4b_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__or4b_2 A B C D_N VGND VNB VPB VPWR X
-M1000 a_455_392# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=9.216e+11p ps=6.22e+06u
-M1001 a_641_392# C a_539_392# VPB pshort w=1e+06u l=180000u
-+  ad=3.6e+11p pd=2.72e+06u as=3.3e+11p ps=2.66e+06u
-M1002 a_190_48# C VGND VNB nlowvt w=640000u l=150000u
-+  ad=4.896e+11p pd=4.09e+06u as=1.10645e+12p ps=8.83e+06u
-M1003 VPWR D_N a_27_368# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1004 a_190_48# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_190_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1006 a_190_48# a_27_368# a_641_392# VPB pshort w=1e+06u l=180000u
-+  ad=4.3e+11p pd=2.86e+06u as=0p ps=0u
-M1007 a_539_392# B a_455_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND B a_190_48# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_190_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1010 VGND D_N a_27_368# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1011 VGND a_27_368# a_190_48# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_190_48# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_190_48# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_455_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VPWR a_190_48# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_190_48# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 VGND C a_190_48# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 X a_190_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_190_48# a_27_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 VGND a_190_48# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_539_392# C a_641_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_27_368# D_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 X a_190_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_455_392# B a_539_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_27_368# D_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X12 VGND A a_190_48# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 a_641_392# a_27_368# a_190_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/or4b/sky130_fd_sc_ms__or4b_4.cdl b/cells/or4b/sky130_fd_sc_ms__or4b_4.cdl
index 6c848fb..2f25409 100644
--- a/cells/or4b/sky130_fd_sc_ms__or4b_4.cdl
+++ b/cells/or4b/sky130_fd_sc_ms__or4b_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ms__or4b_4 A B C D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 D D_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 X y VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 y C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 y D VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or4b_4
diff --git a/cells/or4b/sky130_fd_sc_ms__or4b_4.netlist.tsv b/cells/or4b/sky130_fd_sc_ms__or4b_4.netlist.tsv
index 206487a..6edf230 100644
--- a/cells/or4b/sky130_fd_sc_ms__or4b_4.netlist.tsv
+++ b/cells/or4b/sky130_fd_sc_ms__or4b_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ms__or4b_4	A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4b/sky130_fd_sc_ms__or4b_4.spice b/cells/or4b/sky130_fd_sc_ms__or4b_4.spice
index 0c10694..72af373 100644
--- a/cells/or4b/sky130_fd_sc_ms__or4b_4.spice
+++ b/cells/or4b/sky130_fd_sc_ms__or4b_4.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ms__or4b_4 A B C D_N VGND VNB VPB VPWR X
-M1000 VGND a_27_74# X VNB nlowvt w=740000u l=150000u
-+  ad=1.3615e+12p pd=1.11e+07u as=5.069e+11p ps=4.33e+06u
-M1001 a_119_392# B a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=5.9e+11p pd=5.18e+06u as=8.8e+11p ps=7.76e+06u
-M1002 VPWR A a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=1.269e+12p pd=1.106e+07u as=0p ps=0u
-M1003 a_499_392# C a_27_392# VPB pshort w=1e+06u l=180000u
-+  ad=5.9e+11p pd=5.18e+06u as=0p ps=0u
-M1004 a_27_74# a_563_48# a_499_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1005 a_27_392# B a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_119_392# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_499_392# a_563_48# a_27_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_392# C a_499_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_27_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND D_N a_563_48# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.2135e+11p ps=2.98e+06u
-M1012 VGND a_27_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND C a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.2395e+12p ps=7.79e+06u
-M1014 X a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1015 VPWR a_27_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_27_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_74# a_563_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND B a_27_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR D_N a_563_48# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1020 VPWR a_27_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_74# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_563_48# D_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 X a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VPWR A a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 X a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VGND a_27_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 X a_27_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_27_74# a_563_48# a_499_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_27_74# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_119_392# B a_27_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 VGND A a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_27_392# C a_499_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_563_48# D_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 VPWR a_27_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_119_392# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 VPWR a_27_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_499_392# a_563_48# a_27_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 a_499_392# C a_27_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X17 X a_27_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_27_392# B a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X19 VGND a_563_48# a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_27_74# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 VGND a_27_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/or4bb/sky130_fd_sc_ms__or4bb_1.cdl b/cells/or4bb/sky130_fd_sc_ms__or4bb_1.cdl
index 44d4140..079bda3 100644
--- a/cells/or4bb/sky130_fd_sc_ms__or4bb_1.cdl
+++ b/cells/or4bb/sky130_fd_sc_ms__or4bb_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ms__or4bb_1 A B C_N D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 C C_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 D D_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 X y VPB pfet_01v8 m=1 w=1.12 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 nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 y D VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or4bb_1
diff --git a/cells/or4bb/sky130_fd_sc_ms__or4bb_1.netlist.tsv b/cells/or4bb/sky130_fd_sc_ms__or4bb_1.netlist.tsv
index 143709d..c3e37be 100644
--- a/cells/or4bb/sky130_fd_sc_ms__or4bb_1.netlist.tsv
+++ b/cells/or4bb/sky130_fd_sc_ms__or4bb_1.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ms__or4bb_1	A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4bb/sky130_fd_sc_ms__or4bb_1.spice b/cells/or4bb/sky130_fd_sc_ms__or4bb_1.spice
index 26ab0df..2011ee5 100644
--- a/cells/or4bb/sky130_fd_sc_ms__or4bb_1.spice
+++ b/cells/or4bb/sky130_fd_sc_ms__or4bb_1.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ms__or4bb_1 A B C_N D_N VGND VNB VPB VPWR X
-M1000 a_357_378# a_219_424# VGND VNB nlowvt w=550000u l=150000u
-+  ad=3.7675e+11p pd=3.57e+06u as=9.22e+11p ps=7.96e+06u
-M1001 a_629_378# B a_533_378# VPB pshort w=1e+06u l=180000u
-+  ad=3.6e+11p pd=2.72e+06u as=3e+11p ps=2.6e+06u
-M1002 a_533_378# a_27_424# a_449_378# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1003 a_219_424# D_N VPWR VPB pshort w=840000u l=180000u
-+  ad=4.2525e+11p pd=2.94e+06u as=7.094e+11p ps=5.37e+06u
-M1004 VGND C_N a_27_424# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1005 VPWR C_N a_27_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1006 VPWR A a_629_378# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_357_378# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1008 a_219_424# D_N VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1009 VGND A a_357_378# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_357_378# B VGND VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_357_378# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1012 a_449_378# a_219_424# a_357_378# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1013 VGND a_27_424# a_357_378# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_357_378# a_27_424# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X1 a_533_378# B a_629_378# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_449_378# a_27_424# a_533_378# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 a_357_378# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X4 VGND D_N a_219_424# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X5 a_27_424# C_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X6 a_27_424# C_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 VGND B a_357_378# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X8 a_357_378# a_219_424# a_449_378# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 VPWR D_N a_219_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X10 VPWR a_357_378# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_629_378# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X12 VGND a_219_424# a_357_378# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X13 VGND a_357_378# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/or4bb/sky130_fd_sc_ms__or4bb_2.cdl b/cells/or4bb/sky130_fd_sc_ms__or4bb_2.cdl
index 1847d82..e478127 100644
--- a/cells/or4bb/sky130_fd_sc_ms__or4bb_2.cdl
+++ b/cells/or4bb/sky130_fd_sc_ms__or4bb_2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ms__or4bb_2 A B C_N D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 C C_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 D D_N VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 X y VPB pfet_01v8 m=2 w=1.12 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 nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 y D VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or4bb_2
diff --git a/cells/or4bb/sky130_fd_sc_ms__or4bb_2.netlist.tsv b/cells/or4bb/sky130_fd_sc_ms__or4bb_2.netlist.tsv
index 5058af1..21ac86d 100644
--- a/cells/or4bb/sky130_fd_sc_ms__or4bb_2.netlist.tsv
+++ b/cells/or4bb/sky130_fd_sc_ms__or4bb_2.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ms__or4bb_2	A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4bb/sky130_fd_sc_ms__or4bb_2.spice b/cells/or4bb/sky130_fd_sc_ms__or4bb_2.spice
index 404b864..c95327d 100644
--- a/cells/or4bb/sky130_fd_sc_ms__or4bb_2.spice
+++ b/cells/or4bb/sky130_fd_sc_ms__or4bb_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ms__or4bb_2 A B C_N D_N VGND VNB VPB VPWR X
-M1000 VGND a_548_110# a_182_270# VNB nlowvt w=640000u l=150000u
-+  ad=1.16472e+12p pd=9.37e+06u as=5.192e+11p ps=4.27e+06u
-M1001 VPWR A a_692_392# VPB pshort w=1e+06u l=180000u
-+  ad=9.926e+11p pd=8.39e+06u as=2.1e+11p ps=2.42e+06u
-M1002 a_692_392# B a_590_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.3e+11p ps=2.66e+06u
-M1003 a_182_270# B VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_548_110# C_N VPWR VPB pshort w=840000u l=180000u
-+  ad=2.31e+11p pd=2.23e+06u as=0p ps=0u
-M1005 X a_182_270# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1006 X a_182_270# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1007 VGND a_182_270# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND D_N a_27_424# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1009 VPWR a_182_270# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_548_110# C_N VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1011 a_506_392# a_27_424# a_182_270# VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=2.7e+11p ps=2.54e+06u
-M1012 a_590_392# a_548_110# a_506_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A a_182_270# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_182_270# a_27_424# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR D_N a_27_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.268e+11p ps=2.22e+06u
+X0 VPWR a_182_270# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR C_N a_548_110# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 VGND B a_182_270# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_182_270# a_548_110# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_182_270# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 X a_182_270# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VGND a_182_270# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VGND C_N a_548_110# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X8 a_590_392# B a_692_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 VGND a_27_424# a_182_270# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_182_270# a_27_424# a_506_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X11 a_27_424# D_N VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X12 a_506_392# a_548_110# a_590_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 a_27_424# D_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X14 X a_182_270# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_692_392# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/or4bb/sky130_fd_sc_ms__or4bb_4.cdl b/cells/or4bb/sky130_fd_sc_ms__or4bb_4.cdl
index 85b0035..5383ee3 100644
--- a/cells/or4bb/sky130_fd_sc_ms__or4bb_4.cdl
+++ b/cells/or4bb/sky130_fd_sc_ms__or4bb_4.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ms__or4bb_4 A B C_N D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 C C_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 D D_N VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 X y VPB pfet_01v8 m=4 w=1.12 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 nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 y D VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__or4bb_4
diff --git a/cells/or4bb/sky130_fd_sc_ms__or4bb_4.netlist.tsv b/cells/or4bb/sky130_fd_sc_ms__or4bb_4.netlist.tsv
index 4f0150f..b8b49b6 100644
--- a/cells/or4bb/sky130_fd_sc_ms__or4bb_4.netlist.tsv
+++ b/cells/or4bb/sky130_fd_sc_ms__or4bb_4.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ms__or4bb_4	A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4bb/sky130_fd_sc_ms__or4bb_4.spice b/cells/or4bb/sky130_fd_sc_ms__or4bb_4.spice
index 6d8c5eb..d0d8bc8 100644
--- a/cells/or4bb/sky130_fd_sc_ms__or4bb_4.spice
+++ b/cells/or4bb/sky130_fd_sc_ms__or4bb_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__or4bb_4 A B C_N D_N VGND VNB VPB VPWR X
-M1000 a_1273_392# B a_1063_392# VPB pshort w=1e+06u l=180000u
-+  ad=8.3e+11p pd=7.66e+06u as=5.9e+11p ps=5.18e+06u
-M1001 VGND a_193_277# X VNB nlowvt w=740000u l=150000u
-+  ad=2.0924e+12p pd=1.558e+07u as=6.919e+11p ps=4.83e+06u
-M1002 a_1273_392# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=1.5228e+12p ps=1.154e+07u
-M1003 X a_193_277# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=9.184e+11p pd=6.12e+06u as=0p ps=0u
-M1004 VPWR A a_1273_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_193_277# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_193_277# a_27_94# a_791_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=8.3e+11p ps=7.66e+06u
-M1007 VGND A a_193_277# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.4134e+12p ps=6.78e+06u
-M1008 VGND D_N a_27_94# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1009 a_681_368# C_N VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.719e+11p pd=1.85e+06u as=0p ps=0u
-M1010 a_791_392# a_27_94# a_193_277# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR D_N a_27_94# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1012 X a_193_277# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_193_277# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_193_277# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_193_277# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_791_392# a_681_368# a_1063_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_193_277# a_27_94# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1063_392# a_681_368# a_791_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_193_277# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_193_277# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_681_368# a_193_277# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_681_368# C_N VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1023 a_1063_392# B a_1273_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1063_392# a_681_368# a_791_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 X a_193_277# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_1273_392# B a_1063_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 VPWR a_193_277# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_1273_392# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 VGND a_193_277# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_791_392# a_27_94# a_193_277# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_27_94# D_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 X a_193_277# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 VPWR A a_1273_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 X a_193_277# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VPWR a_193_277# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_27_94# D_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 VGND C_N a_681_368# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 a_1063_392# B a_1273_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X15 a_193_277# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_193_277# a_27_94# a_791_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X17 X a_193_277# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 VPWR C_N a_681_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X19 a_791_392# a_681_368# a_1063_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X20 VGND a_193_277# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 a_193_277# a_681_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 VGND B a_193_277# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 VGND a_27_94# a_193_277# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.cdl b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.cdl
index 429cf75..621ed87 100644
--- a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.cdl
+++ b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.cdl
@@ -17,100 +17,100 @@
 .SUBCKT sky130_fd_sc_ms__sdfbbn_1 CLK_N D RESET_B SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK_N:I D:I RESET_B:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I
 *.PININFO VPWR:I Q:O Q_N:O
-MI98 net93 D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 net93 SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI46 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI98 net93 D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 net93 SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI46 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 RESET RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI642 RESET RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI676 M1 M0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI676 M1 M0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net116 SET_B VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI675 net116 SET_B VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net273 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI677 M1 RESET VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 Q net273 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 net132 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net149 net177 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI677 M1 RESET VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N net177 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net273 net177 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI648 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net93 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI44 clkpos CLK_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI668 S0 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI667 net164 M1 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI630 net177 RESET VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI649 net132 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI3 net177 S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net176 SET_B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 net93 D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 net93 sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI679 M1 SET_B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net273 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net177 S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI670 net221 M1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI678 net268 RESET VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI655 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net229 net177 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI654 net149 net177 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 Q_N net177 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net177 SET_B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 net216 RESET VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 net245 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net93 clkpos VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI652 net273 net177 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net93 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 RESET RESET_B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI668 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI667 net164 M1 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK_N VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI630 net177 RESET VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI680 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net273 net177 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI3 net177 S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N net177 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI7 net176 SET_B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI640 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI94 net93 D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 net93 sceb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI679 M1 SET_B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net273 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net177 S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 net221 M1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI678 net268 RESET VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net229 net177 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net177 SET_B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 net216 RESET VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 net245 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net93 clkpos VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 RESET RESET_B VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK_N VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI680 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net273 net177 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N net177 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8 m=1 w=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_ms__sdfbbn_1
diff --git a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.netlist.tsv b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.netlist.tsv
index bda374a..52871b4 100644
--- a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.netlist.tsv
+++ b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.netlist.tsv
@@ -1,50 +1,50 @@
 sky130_fd_sc_ms__sdfbbn_1	CLK_N:I D:I RESET_B:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI98	MOSFET	net93	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	net93	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	RESET	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI676	MOSFET	M1	M0	net116	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net116	SET_B	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net273	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	M1	RESET	net116	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M0	clkpos	net132	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	net132	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	S0	clkneg	net149	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net149	net177	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	net177	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net273	net177	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net93	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI668	MOSFET	S0	clkpos	net164	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net164	M1	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI630	MOSFET	net177	RESET	net176	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net177	S0	net176	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net176	SET_B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	net93	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	net93	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	M1	SET_B	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkneg	net221	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net273	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net177	S0	net216	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net221	M1	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net268	RESET	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net229	net177	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net229	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net177	SET_B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net216	RESET	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	net245	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net93	clkpos	M0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M0	clkneg	net245	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	RESET	RESET_B	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	M1	M0	net268	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net273	net177	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net177	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	net93	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	net93	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	RESET	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI676	MOSFET	M1	M0	net116	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	net116	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net273	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	M1	RESET	net116	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M0	clkpos	net132	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	net132	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	S0	clkneg	net149	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net149	net177	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	net177	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net273	net177	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net93	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI668	MOSFET	S0	clkpos	net164	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net164	M1	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI630	MOSFET	net177	RESET	net176	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net177	S0	net176	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net176	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	net93	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	net93	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkneg	net221	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net273	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net177	S0	net216	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net221	M1	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI678	MOSFET	net268	RESET	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net229	net177	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	S0	clkpos	net229	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net177	SET_B	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net216	RESET	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	net245	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net93	clkpos	M0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M0	clkneg	net245	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	RESET	RESET_B	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	M1	M0	net268	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net273	net177	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net177	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.spice b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.spice
index 17d480e..ff9f2a7 100644
--- a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.spice
+++ b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.spice
@@ -17,100 +17,52 @@
 
 .subckt sky130_fd_sc_ms__sdfbbn_1 CLK_N D RESET_B SCD SCE SET_B VGND VNB VPB VPWR
 + Q Q_N
-M1000 a_353_93# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.792e+11p pd=1.84e+06u as=2.8826e+12p ps=2.42e+07u
-M1001 a_1906_424# a_977_243# VPWR VPB pshort w=840000u l=180000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1002 a_305_119# D a_197_119# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.129e+11p ps=3.17e+06u
-M1003 a_197_119# a_867_82# a_1162_497# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1004 VGND RESET_B a_1579_258# VNB nlowvt w=420000u l=150000u
-+  ad=2.11888e+12p pd=1.742e+07u as=1.197e+11p ps=1.41e+06u
-M1005 a_977_243# a_1162_497# a_1434_78# VNB nlowvt w=550000u l=150000u
-+  ad=2.09e+11p pd=1.86e+06u as=5.1045e+11p ps=4.25e+06u
-M1006 a_119_119# SCD VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1007 Q_N a_2133_410# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1008 VPWR SCD a_27_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=3.552e+11p ps=3.67e+06u
-M1009 a_2392_74# SET_B VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.947e+11p pd=4.37e+06u as=0p ps=0u
-M1010 VGND a_2133_410# a_2164_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.638e+11p ps=1.62e+06u
-M1011 a_197_119# D a_215_464# VPB pshort w=640000u l=180000u
-+  ad=3.84e+11p pd=3.76e+06u as=1.536e+11p ps=1.76e+06u
-M1012 VPWR a_2133_410# a_2091_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1013 a_27_464# a_353_93# a_197_119# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1162_497# a_867_82# a_1084_497# VPB pshort w=420000u l=180000u
-+  ad=2.107e+11p pd=1.99e+06u as=8.82e+10p ps=1.26e+06u
-M1015 a_1954_119# a_867_82# a_1906_424# VPB pshort w=840000u l=180000u
-+  ad=2.667e+11p pd=2.39e+06u as=0p ps=0u
-M1016 VPWR a_2133_410# a_3078_384# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1017 a_197_119# a_662_82# a_1162_497# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND CLK_N a_662_82# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1019 a_867_82# a_662_82# VGND VNB nlowvt w=740000u l=150000u
-+  ad=3.219e+11p pd=2.35e+06u as=0p ps=0u
-M1020 a_1162_497# a_662_82# a_1151_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1021 a_353_93# SCE VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1022 Q a_3078_384# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1023 a_2512_392# a_1579_258# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1024 VGND a_2133_410# a_3078_384# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1025 a_1151_119# a_977_243# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND SET_B a_1434_78# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1954_119# a_662_82# a_1876_119# VNB nlowvt w=550000u l=150000u
-+  ad=4.807e+11p pd=2.9e+06u as=1.32e+11p ps=1.58e+06u
-M1028 VPWR SET_B a_2133_410# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.6e+11p ps=5.12e+06u
-M1029 VPWR CLK_N a_662_82# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1030 a_2091_508# a_662_82# a_1954_119# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1084_497# a_977_243# VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_2392_74# a_1954_119# a_2133_410# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.812e+11p ps=2.24e+06u
-M1033 a_867_82# a_662_82# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1034 a_197_119# SCE a_119_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_353_93# a_305_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_215_464# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1531_424# a_1162_497# a_977_243# VPB pshort w=840000u l=180000u
-+  ad=2.016e+11p pd=2.16e+06u as=6.09e+11p ps=4.81e+06u
-M1038 Q a_3078_384# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1039 a_2133_410# a_1579_258# a_2392_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_2164_119# a_867_82# a_1954_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR a_1579_258# a_1531_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_1876_119# a_977_243# VGND VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 Q_N a_2133_410# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1044 a_977_243# SET_B VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_1434_78# a_1579_258# a_977_243# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_2133_410# a_1954_119# a_2512_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VPWR RESET_B a_1579_258# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=3.529e+11p ps=3.68e+06u
+X0 a_2091_508# a_2133_410# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X1 a_197_119# a_353_93# a_27_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X2 a_1162_497# a_867_82# a_197_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 a_977_243# a_1579_258# a_1434_78# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X4 a_2133_410# a_1954_119# a_2392_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_1579_258# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X6 a_1151_119# a_662_82# a_1162_497# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 VPWR a_662_82# a_867_82# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VPWR a_977_243# a_1084_497# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X9 VPWR a_1579_258# a_2512_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 VPWR a_3078_384# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VGND a_3078_384# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_1434_78# a_1162_497# a_977_243# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X13 a_977_243# a_1162_497# a_1531_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X14 VPWR SCE a_353_93# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X15 a_3078_384# a_2133_410# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X16 a_2133_410# SET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X17 a_1579_258# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X18 a_27_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X19 VGND a_2133_410# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_1084_497# a_867_82# a_1162_497# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X21 a_1531_424# a_1579_258# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X22 a_1906_424# a_867_82# a_1954_119# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X23 a_305_119# a_353_93# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X24 a_662_82# CLK_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X25 a_215_464# D a_197_119# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X26 VGND SCD a_119_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 VGND SCE a_353_93# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X28 a_2164_119# a_2133_410# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X29 a_1876_119# a_662_82# a_1954_119# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X30 a_662_82# CLK_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X31 VGND a_977_243# a_1151_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X32 VGND a_662_82# a_867_82# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 a_1954_119# a_867_82# a_2164_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X34 a_3078_384# a_2133_410# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X35 VPWR a_977_243# a_1906_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X36 a_2392_74# a_1579_258# a_2133_410# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X37 a_1954_119# a_662_82# a_2091_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X38 a_2512_392# a_1954_119# a_2133_410# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X39 VGND SET_B a_2392_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X40 VPWR SCE a_215_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X41 a_1434_78# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X42 a_197_119# D a_305_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X43 VPWR SET_B a_977_243# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X44 VPWR a_2133_410# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X45 a_1162_497# a_662_82# a_197_119# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X46 VGND a_977_243# a_1876_119# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X47 a_119_119# SCE a_197_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.cdl b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.cdl
index def1dad..91260a8 100644
--- a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.cdl
+++ b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.cdl
@@ -17,100 +17,100 @@
 .SUBCKT sky130_fd_sc_ms__sdfbbn_2 CLK_N D RESET_B SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK_N:I D:I RESET_B:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I
 *.PININFO VPWR:I Q:O Q_N:O
-MI98 net93 D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 net93 SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI46 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI98 net93 D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 net93 SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI46 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 RESET RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI642 RESET RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI676 M1 M0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI676 M1 M0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net116 SET_B VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI675 net116 SET_B VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net273 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI677 M1 RESET VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 Q net273 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 net141 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net149 net177 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI677 M1 RESET VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N net177 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net273 net177 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI648 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net93 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI44 clkpos CLK_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI668 S0 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI667 net169 M1 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI630 net177 RESET VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI649 net141 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI3 net177 S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net176 SET_B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 net93 D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 net93 sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI679 M1 SET_B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net273 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net177 S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI670 net221 M1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI678 net268 RESET VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI655 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net229 net177 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI654 net149 net177 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 Q_N net177 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net177 SET_B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 net216 RESET VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 net245 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net93 clkpos VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI652 net273 net177 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net93 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 RESET RESET_B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI668 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI667 net169 M1 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK_N VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI630 net177 RESET VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI680 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net273 net177 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI3 net177 S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N net177 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI7 net176 SET_B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI640 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI94 net93 D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 net93 sceb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI679 M1 SET_B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net273 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net177 S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 net221 M1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI678 net268 RESET VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net229 net177 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net177 SET_B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 net216 RESET VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 net245 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net93 clkpos VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 RESET RESET_B VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK_N VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI680 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net273 net177 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N net177 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8 m=1 w=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_ms__sdfbbn_2
diff --git a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.netlist.tsv b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.netlist.tsv
index efb828f..3242954 100644
--- a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.netlist.tsv
+++ b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.netlist.tsv
@@ -1,50 +1,50 @@
 sky130_fd_sc_ms__sdfbbn_2	CLK_N:I D:I RESET_B:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI98	MOSFET	net93	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	net93	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	RESET	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI676	MOSFET	M1	M0	net116	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net116	SET_B	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net273	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	M1	RESET	net116	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M0	clkpos	net141	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	net141	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	S0	clkneg	net149	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net149	net177	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	net177	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net273	net177	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net93	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI668	MOSFET	S0	clkpos	net169	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net169	M1	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI630	MOSFET	net177	RESET	net176	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net177	S0	net176	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net176	SET_B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	net93	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	net93	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	M1	SET_B	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkneg	net221	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net273	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net177	S0	net216	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net221	M1	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net268	RESET	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net229	net177	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net229	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net177	SET_B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net216	RESET	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	net245	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net93	clkpos	M0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M0	clkneg	net245	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	RESET	RESET_B	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	M1	M0	net268	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net273	net177	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net177	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	net93	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	net93	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	RESET	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI676	MOSFET	M1	M0	net116	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	net116	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net273	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	M1	RESET	net116	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M0	clkpos	net141	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	net141	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	S0	clkneg	net149	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net149	net177	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	net177	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net273	net177	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net93	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI668	MOSFET	S0	clkpos	net169	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net169	M1	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI630	MOSFET	net177	RESET	net176	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net177	S0	net176	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net176	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	net93	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	net93	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkneg	net221	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net273	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net177	S0	net216	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net221	M1	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI678	MOSFET	net268	RESET	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net229	net177	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	S0	clkpos	net229	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net177	SET_B	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net216	RESET	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	net245	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net93	clkpos	M0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M0	clkneg	net245	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	RESET	RESET_B	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	M1	M0	net268	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net273	net177	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net177	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.spice b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.spice
index b3a7299..bf402e2 100644
--- a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.spice
+++ b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.spice
@@ -17,108 +17,56 @@
 
 .subckt sky130_fd_sc_ms__sdfbbn_2 CLK_N D RESET_B SCD SCE SET_B VGND VNB VPB VPWR
 + Q Q_N
-M1000 VPWR RESET_B a_1643_257# VPB pshort w=640000u l=180000u
-+  ad=3.89413e+12p pd=2.968e+07u as=1.792e+11p ps=1.84e+06u
-M1001 a_871_368# a_688_98# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1002 a_2174_508# a_688_98# a_1997_82# VPB pshort w=420000u l=180000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.667e+11p ps=2.39e+06u
-M1003 a_1157_464# a_871_368# a_1073_464# VPB pshort w=420000u l=180000u
-+  ad=2.107e+11p pd=1.99e+06u as=1.008e+11p ps=1.32e+06u
-M1004 a_1595_424# a_1157_464# a_1007_366# VPB pshort w=840000u l=180000u
-+  ad=2.016e+11p pd=2.16e+06u as=9.702e+11p ps=5.67e+06u
-M1005 VPWR SET_B a_2216_410# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.6e+11p ps=5.12e+06u
-M1006 a_2452_74# SET_B VGND VNB nlowvt w=740000u l=150000u
-+  ad=5.7435e+11p pd=4.64e+06u as=2.86405e+12p ps=2.37e+07u
-M1007 VGND a_2216_410# Q_N VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1008 a_119_119# SCD VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1009 a_197_119# a_871_368# a_1157_464# VNB nlowvt w=420000u l=150000u
-+  ad=4.347e+11p pd=3.75e+06u as=1.281e+11p ps=1.45e+06u
-M1010 VGND RESET_B a_1643_257# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1011 a_2452_74# a_1997_82# a_2216_410# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1012 VPWR SCD a_27_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=3.584e+11p ps=3.68e+06u
-M1013 a_209_464# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1014 VPWR a_2216_410# a_3272_94# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.55e+06u
-M1015 a_2247_82# a_871_368# a_1997_82# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=4.945e+11p ps=3.3e+06u
-M1016 a_1157_464# a_688_98# a_1185_125# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1017 a_341_410# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1018 a_197_119# a_688_98# a_1157_464# VPB pshort w=640000u l=180000u
-+  ad=3.84e+11p pd=3.76e+06u as=0p ps=0u
-M1019 a_1007_366# a_1157_464# a_1473_73# VNB nlowvt w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=6.0335e+11p ps=4.55e+06u
-M1020 a_1473_73# a_1643_257# a_1007_366# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_2216_410# a_3272_94# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1022 a_1989_424# a_1007_366# VPWR VPB pshort w=840000u l=180000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1023 a_1997_82# a_688_98# a_1902_125# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=2.16375e+11p ps=2.18e+06u
-M1024 Q_N a_2216_410# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Q a_3272_94# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1026 Q_N a_2216_410# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1027 a_1997_82# a_871_368# a_1989_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND a_341_410# a_363_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1029 Q a_3272_94# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1030 a_1073_464# a_1007_366# VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1185_125# a_1007_366# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR a_2216_410# Q_N VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_1643_257# a_1595_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_2559_392# a_1643_257# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1035 VPWR a_3272_94# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR a_2216_410# a_2174_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_197_119# SCE a_119_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND CLK_N a_688_98# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1039 a_341_410# SCE VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1040 a_2216_410# a_1997_82# a_2559_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_2216_410# a_1643_257# a_2452_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_197_119# D a_209_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND a_3272_94# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_363_119# D a_197_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_27_464# a_341_410# a_197_119# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_871_368# a_688_98# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1047 VGND a_2216_410# a_2247_82# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 VPWR CLK_N a_688_98# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1049 a_1902_125# a_1007_366# VGND VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 a_1007_366# SET_B VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 VGND SET_B a_1473_73# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_1007_366# a_1989_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X1 a_1989_424# a_871_368# a_1997_82# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 VPWR a_2216_410# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_1007_366# a_1157_464# a_1595_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X4 a_1157_464# a_871_368# a_197_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 Q a_3272_94# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 a_688_98# CLK_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_1997_82# a_688_98# a_2174_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X8 a_1643_257# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X9 a_1473_73# a_1157_464# a_1007_366# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X10 a_1997_82# a_871_368# a_2247_82# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X11 a_209_464# D a_197_119# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X12 a_1473_73# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X13 a_2174_508# a_2216_410# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X14 a_3272_94# a_2216_410# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 a_27_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X16 VGND SCE a_341_410# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X17 VGND a_688_98# a_871_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 VGND SET_B a_2452_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 VPWR a_3272_94# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_1007_366# a_1643_257# a_1473_73# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X21 VGND SCD a_119_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X22 a_363_119# a_341_410# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X23 VGND a_1007_366# a_1185_125# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X24 a_1185_125# a_688_98# a_1157_464# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X25 VGND a_1007_366# a_1902_125# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X26 a_1157_464# a_688_98# a_197_119# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X27 VPWR a_1643_257# a_2559_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X28 Q_N a_2216_410# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X29 VPWR a_688_98# a_871_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X30 Q_N a_2216_410# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 a_1073_464# a_871_368# a_1157_464# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X32 a_1902_125# a_688_98# a_1997_82# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X33 a_2452_74# a_1643_257# a_2216_410# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 a_2559_392# a_1997_82# a_2216_410# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X35 a_1595_424# a_1643_257# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X36 a_688_98# CLK_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X37 a_2216_410# SET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X38 a_3272_94# a_2216_410# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X39 VGND a_2216_410# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X40 a_197_119# a_341_410# a_27_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X41 VPWR SCE a_341_410# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X42 VGND a_3272_94# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X43 a_2247_82# a_2216_410# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X44 a_1643_257# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X45 a_2216_410# a_1997_82# a_2452_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X46 a_197_119# D a_363_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X47 Q a_3272_94# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X48 VPWR SCE a_209_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X49 VPWR a_1007_366# a_1073_464# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X50 VPWR SET_B a_1007_366# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X51 a_119_119# SCE a_197_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.cdl b/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.cdl
index 9e3eaff..e77a5bf 100644
--- a/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.cdl
+++ b/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.cdl
@@ -17,100 +17,100 @@
 .SUBCKT sky130_fd_sc_ms__sdfbbp_1 CLK D RESET_B SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I
 *.PININFO VPWR:I Q:O Q_N:O
-MI98 net93 D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 net93 SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI46 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI98 net93 D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 net93 SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI46 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 RESET RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI642 RESET RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI676 M1 M0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI676 M1 M0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net116 SET_B VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI675 net116 SET_B VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net273 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI677 M1 RESET VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 net141 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net149 net177 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 Q net273 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N net177 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net273 net177 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI677 M1 RESET VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net93 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI648 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI668 S0 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI667 net169 M1 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI630 net177 RESET VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI3 net177 S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net176 SET_B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 net93 D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 net93 sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI679 M1 SET_B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net273 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net177 S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI670 net221 M1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI678 net268 RESET VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI649 net141 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net229 net177 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI655 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net177 SET_B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 net216 RESET VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 net245 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net93 clkpos VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI654 net149 net177 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 Q_N net177 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 RESET RESET_B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI652 net273 net177 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net93 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI668 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI680 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net273 net177 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI667 net169 M1 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N net177 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI630 net177 RESET VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI3 net177 S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net176 SET_B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI640 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI94 net93 D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 net93 sceb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI679 M1 SET_B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net273 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net177 S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 net221 M1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI678 net268 RESET VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net229 net177 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net177 SET_B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 net216 RESET VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 net245 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net93 clkpos VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 RESET RESET_B VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI680 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net273 net177 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N net177 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8 m=1 w=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_ms__sdfbbp_1
diff --git a/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.netlist.tsv b/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.netlist.tsv
index 367479b..4c9ac5e 100644
--- a/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.netlist.tsv
+++ b/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.netlist.tsv
@@ -1,50 +1,50 @@
 sky130_fd_sc_ms__sdfbbp_1	CLK:I D:I RESET_B:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI98	MOSFET	net93	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	net93	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	RESET	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI676	MOSFET	M1	M0	net116	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net116	SET_B	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net273	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	M1	RESET	net116	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M0	clkpos	net141	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	net141	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	S0	clkneg	net149	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net149	net177	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	net177	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net273	net177	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net93	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI668	MOSFET	S0	clkpos	net169	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net169	M1	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI630	MOSFET	net177	RESET	net176	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net177	S0	net176	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net176	SET_B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	net93	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	net93	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	M1	SET_B	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkneg	net221	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net273	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net177	S0	net216	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net221	M1	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net268	RESET	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net229	net177	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net229	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net177	SET_B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net216	RESET	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	net245	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net93	clkpos	M0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M0	clkneg	net245	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	RESET	RESET_B	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	M1	M0	net268	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net273	net177	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net177	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	net93	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	net93	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	RESET	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI676	MOSFET	M1	M0	net116	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	net116	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net273	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	M1	RESET	net116	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M0	clkpos	net141	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	net141	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	S0	clkneg	net149	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net149	net177	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	net177	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net273	net177	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net93	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI668	MOSFET	S0	clkpos	net169	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net169	M1	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI630	MOSFET	net177	RESET	net176	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net177	S0	net176	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net176	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	net93	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	net93	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkneg	net221	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net273	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net177	S0	net216	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net221	M1	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI678	MOSFET	net268	RESET	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net229	net177	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	S0	clkpos	net229	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net177	SET_B	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net216	RESET	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	net245	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net93	clkpos	M0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M0	clkneg	net245	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	RESET	RESET_B	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	M1	M0	net268	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net273	net177	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net177	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.spice b/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.spice
index 8076c39..5d8c3e7 100644
--- a/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.spice
+++ b/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.spice
@@ -17,100 +17,52 @@
 
 .subckt sky130_fd_sc_ms__sdfbbp_1 CLK D RESET_B SCD SCE SET_B VGND VNB VPB VPWR Q
 + Q_N
-M1000 VGND a_1250_231# a_1192_96# VNB nlowvt w=420000u l=150000u
-+  ad=2.22013e+12p pd=1.787e+07u as=1.61875e+11p ps=1.78e+06u
-M1001 VGND a_2037_442# a_2061_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.638e+11p ps=1.62e+06u
-M1002 a_877_98# a_622_98# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.516e+11p pd=2.16e+06u as=0p ps=0u
-M1003 a_1881_420# a_877_98# a_1880_119# VNB nlowvt w=550000u l=150000u
-+  ad=2.3445e+11p pd=2.34e+06u as=1.155e+11p ps=1.52e+06u
-M1004 a_2271_74# SET_B VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.218e+11p pd=4.1e+06u as=0p ps=0u
-M1005 Q a_2881_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1006 a_119_119# SCD VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1007 VGND RESET_B a_1625_93# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1008 VPWR a_1625_93# a_1583_379# VPB pshort w=840000u l=180000u
-+  ad=2.88865e+12p pd=2.393e+07u as=2.016e+11p ps=2.16e+06u
-M1009 VPWR a_1625_93# a_2387_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.1e+11p ps=2.42e+06u
-M1010 VPWR SCD a_27_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=3.584e+11p ps=3.68e+06u
-M1011 a_299_119# D a_197_119# VNB nlowvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.709e+11p ps=2.97e+06u
-M1012 a_1881_420# a_622_98# a_1769_379# VPB pshort w=840000u l=180000u
-+  ad=2.709e+11p pd=2.4e+06u as=3.438e+11p ps=2.85e+06u
-M1013 Q_N a_2037_442# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1014 VPWR CLK a_622_98# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1015 a_1250_231# SET_B VPWR VPB pshort w=840000u l=180000u
-+  ad=3.024e+11p pd=2.4e+06u as=0p ps=0u
-M1016 VGND a_341_93# a_299_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1880_119# a_1250_231# VGND VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_2037_442# a_2881_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1019 a_877_98# a_622_98# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1020 VPWR a_1250_231# a_1224_419# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1021 a_1250_231# a_1092_96# a_1418_125# VNB nlowvt w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=7.81e+11p ps=5.37e+06u
-M1022 a_1418_125# a_1625_93# a_1250_231# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Q a_2881_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1024 VPWR a_2037_442# a_1989_504# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1025 a_1418_125# SET_B VGND VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_2061_74# a_622_98# a_1881_420# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_2037_442# a_2881_74# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1028 a_221_464# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1029 a_1092_96# a_877_98# a_197_119# VPB pshort w=640000u l=180000u
-+  ad=2.167e+11p pd=2.05e+06u as=3.52e+11p ps=3.66e+06u
-M1030 a_1583_379# a_1092_96# a_1250_231# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1769_379# a_1250_231# VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_341_93# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1033 a_197_119# SCE a_119_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1192_96# a_877_98# a_1092_96# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.47e+11p ps=1.54e+06u
-M1035 a_2037_442# a_1881_420# a_2271_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=0p ps=0u
-M1036 Q_N a_2037_442# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1037 a_1224_419# a_622_98# a_1092_96# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1092_96# a_622_98# a_197_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_197_119# D a_221_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1989_504# a_877_98# a_1881_420# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_2387_392# a_1881_420# a_2037_442# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=3.7e+11p ps=2.74e+06u
-M1042 a_27_464# a_341_93# a_197_119# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_341_93# SCE VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1044 VGND CLK a_622_98# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1045 a_2271_74# a_1625_93# a_2037_442# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_2037_442# SET_B VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VPWR RESET_B a_1625_93# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
+X0 a_1092_96# a_877_98# a_1192_96# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X1 a_2037_442# a_1625_93# a_2271_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_1092_96# a_622_98# a_1224_419# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X3 a_2881_74# a_2037_442# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X4 VGND SET_B a_2271_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_1989_504# a_2037_442# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X6 a_1250_231# a_1092_96# a_1583_379# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 VGND a_622_98# a_877_98# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_2387_392# a_1625_93# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 VPWR a_2037_442# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_1881_420# a_877_98# a_1989_504# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X11 a_2061_74# a_2037_442# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X12 a_197_119# a_622_98# a_1092_96# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X13 a_1625_93# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X14 VPWR SCE a_221_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X15 VPWR a_622_98# a_877_98# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_197_119# D a_299_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X17 a_27_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X18 a_221_464# D a_197_119# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X19 VGND SET_B a_1418_125# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X20 VPWR a_2881_74# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 VGND a_2881_74# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 VGND a_1250_231# a_1880_119# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X23 a_1880_119# a_877_98# a_1881_420# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X24 a_1881_420# a_622_98# a_2061_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X25 VPWR SCE a_341_93# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X26 VGND SCD a_119_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 a_2037_442# a_1881_420# a_2387_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X28 a_622_98# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_2881_74# a_2037_442# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X30 a_1625_93# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X31 a_299_119# a_341_93# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X32 a_1418_125# a_1092_96# a_1250_231# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X33 VPWR SET_B a_2037_442# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X34 VPWR a_1250_231# a_1769_379# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X35 a_197_119# a_877_98# a_1092_96# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X36 a_1224_419# a_1250_231# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X37 a_622_98# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X38 VGND a_2037_442# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X39 a_1583_379# a_1625_93# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X40 a_1769_379# a_622_98# a_1881_420# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X41 a_1192_96# a_1250_231# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X42 a_197_119# a_341_93# a_27_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X43 VPWR SET_B a_1250_231# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X44 VGND SCE a_341_93# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X45 a_1250_231# a_1625_93# a_1418_125# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X46 a_119_119# SCE a_197_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X47 a_2271_74# a_1881_420# a_2037_442# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.cdl b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.cdl
index b52b196..470f55d 100644
--- a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.cdl
+++ b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.cdl
@@ -17,88 +17,88 @@
 .SUBCKT sky130_fd_sc_ms__sdfrbp_1 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O Q_N:O
-MI642 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N s0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net138 s0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net100 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 Q_N s0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net109 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net121 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net209 s0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net209 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net124 net138 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net138 s0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI666 net164 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net100 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net109 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 net121 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 s0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net209 s0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net209 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net124 net138 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI666 net164 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI98 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
-MI98 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI120 db SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net181 net138 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net138 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI662 net181 net138 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net138 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net138 s0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net200 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net209 s0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net209 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N s0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net138 s0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI648 M1 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net200 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 M1 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI94 db D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net209 s0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net209 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N s0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 db RESET_B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 db RESET_B VPB pfet_01v8 m=1 w=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_ms__sdfrbp_1
diff --git a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.netlist.tsv b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.netlist.tsv
index 82e1f84..163db76 100644
--- a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.netlist.tsv
+++ b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_ms__sdfrbp_1	CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI642	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	s0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net138	s0	net100	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net100	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net109	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net121	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net121	M1	net109	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net124	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net209	s0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net209	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net124	net138	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net164	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	db	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	net164	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	net164	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net181	net138	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net138	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net181	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net138	s0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net200	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net200	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net209	s0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net209	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	s0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	RESET_B	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	s0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net138	s0	net100	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net100	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net109	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net121	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net121	M1	net109	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net124	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net209	s0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net209	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net124	net138	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net164	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	net164	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	net164	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net181	net138	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net138	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net181	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net138	s0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net200	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net200	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net209	s0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net209	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	s0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.spice b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.spice
index fd345d4..ff1cfa6 100644
--- a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.spice
+++ b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.spice
@@ -16,88 +16,46 @@
 
 
 .subckt sky130_fd_sc_ms__sdfrbp_1 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 Q a_2513_424# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=2.27097e+12p ps=1.957e+07u
-M1001 VPWR SCD a_515_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=2.304e+11p ps=2e+06u
-M1002 a_413_90# D a_312_90# VNB nlowvt w=420000u l=150000u
-+  ad=3.26375e+11p pd=3.3e+06u as=1.491e+11p ps=1.55e+06u
-M1003 VGND a_1747_74# a_2513_424# VNB nlowvt w=550000u l=150000u
-+  ad=1.78918e+12p pd=1.476e+07u as=1.4575e+11p ps=1.63e+06u
-M1004 a_1399_119# a_1369_93# a_1321_119# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.008e+11p ps=1.32e+06u
-M1005 VGND a_2008_48# a_1966_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 VPWR a_1369_93# a_1331_463# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1007 a_1369_93# a_1235_119# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1008 VPWR a_1747_74# a_2513_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.184e+11p ps=2.2e+06u
-M1009 a_2124_74# RESET_B VGND VNB nlowvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1010 Q_N a_1747_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1011 a_413_90# RESET_B VPWR VPB pshort w=640000u l=180000u
-+  ad=4.654e+11p pd=5.04e+06u as=0p ps=0u
-M1012 a_2008_48# a_1747_74# a_2124_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1013 VGND CLK a_819_119# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.54e+11p ps=2.22e+06u
-M1014 a_1037_119# a_819_119# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.998e+11p pd=2.02e+06u as=0p ps=0u
-M1015 a_1747_74# a_819_119# a_1369_93# VPB pshort w=1e+06u l=180000u
-+  ad=3.9355e+11p pd=3.45e+06u as=0p ps=0u
-M1016 a_1966_74# a_819_119# a_1747_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=4.519e+11p ps=3.17e+06u
-M1017 a_341_464# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1018 VPWR SCE a_27_74# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=5.696e+11p ps=3.06e+06u
-M1019 a_1235_119# a_1037_119# a_413_90# VPB pshort w=420000u l=180000u
-+  ad=2.268e+11p pd=2.76e+06u as=0p ps=0u
-M1020 a_2008_48# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1021 VPWR a_1747_74# a_2008_48# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_225_90# SCD a_545_97# VNB nlowvt w=420000u l=150000u
-+  ad=2.64075e+11p pd=2.99e+06u as=8.82e+10p ps=1.26e+06u
-M1023 a_312_90# a_27_74# a_225_90# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1331_463# a_819_119# a_1235_119# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR CLK a_819_119# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1026 Q_N a_1747_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1027 a_413_90# D a_341_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND RESET_B a_225_90# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1747_74# a_1037_119# a_1369_93# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1030 a_515_464# a_27_74# a_413_90# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1235_119# a_819_119# a_413_90# VNB nlowvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1032 a_545_97# SCE a_413_90# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1972_489# a_1037_119# a_1747_74# VPB pshort w=420000u l=180000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1034 VGND RESET_B a_1399_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1037_119# a_819_119# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1036 a_1321_119# a_1037_119# a_1235_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Q a_2513_424# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1038 VGND SCE a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1039 VPWR a_2008_48# a_1972_489# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1235_119# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_1369_93# a_1235_119# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X1 VGND a_819_119# a_1037_119# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_1399_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 VGND a_1747_74# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 VPWR RESET_B a_1235_119# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X5 a_413_90# SCE a_545_97# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X6 a_1235_119# a_1037_119# a_1321_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 a_819_119# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_1369_93# a_819_119# a_1747_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 VGND a_2513_424# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_545_97# SCD a_225_90# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X11 a_413_90# a_1037_119# a_1235_119# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X12 a_2008_48# a_1747_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X13 VPWR SCE a_341_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X14 VPWR a_819_119# a_1037_119# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_1235_119# a_819_119# a_1331_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X16 a_2513_424# a_1747_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X17 VGND RESET_B a_2124_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X18 a_413_90# a_819_119# a_1235_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X19 a_1966_74# a_2008_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X20 a_413_90# a_27_74# a_515_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X21 a_1321_119# a_1369_93# a_1399_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X22 a_312_90# D a_413_90# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X23 a_2513_424# a_1747_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X24 a_1331_463# a_1369_93# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X25 a_1747_74# a_819_119# a_1966_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X26 VPWR a_1235_119# a_1369_93# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X27 a_819_119# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 a_515_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X29 VPWR a_1747_74# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X30 VPWR RESET_B a_2008_48# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X31 a_2124_74# a_1747_74# a_2008_48# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X32 a_1369_93# a_1037_119# a_1747_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X33 a_225_90# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X34 VGND a_1235_119# a_1369_93# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X35 VPWR RESET_B a_413_90# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X36 a_225_90# a_27_74# a_312_90# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X37 a_341_464# D a_413_90# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X38 a_27_74# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X39 a_1747_74# a_1037_119# a_1972_489# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X40 a_1972_489# a_2008_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X41 VPWR a_2513_424# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.cdl b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.cdl
index 7f4d025..f851782 100644
--- a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.cdl
+++ b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.cdl
@@ -17,88 +17,88 @@
 .SUBCKT sky130_fd_sc_ms__sdfrbp_2 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O Q_N:O
-MI642 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N s0 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net136 s0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net98 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 Q_N s0 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net107 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net119 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net207 s0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net207 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net135 net136 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net136 s0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI666 net162 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net98 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net107 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 net119 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 s0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net207 s0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net207 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net135 net136 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI666 net162 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI98 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
-MI98 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI120 db SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net179 net136 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net136 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI662 net179 net136 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net136 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net136 s0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net198 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net207 s0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net207 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N s0 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net136 s0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI648 M1 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net198 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 M1 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI94 db D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net207 s0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net207 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N s0 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 db RESET_B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 db RESET_B VPB pfet_01v8 m=1 w=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_ms__sdfrbp_2
diff --git a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.netlist.tsv b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.netlist.tsv
index 441827a..28c39ef 100644
--- a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.netlist.tsv
+++ b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_ms__sdfrbp_2	CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI642	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	s0	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net136	s0	net98	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net98	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net107	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net119	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net119	M1	net107	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net135	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net207	s0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net207	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net135	net136	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net162	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	db	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	net162	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	net162	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net179	net136	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net136	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net179	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net136	s0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net198	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net198	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net207	s0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net207	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	s0	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	RESET_B	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	s0	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net136	s0	net98	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net98	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net107	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net119	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net119	M1	net107	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net135	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net207	s0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net207	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net135	net136	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net162	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	net162	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	net162	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net179	net136	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net136	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net179	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net136	s0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net198	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net198	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net207	s0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net207	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	s0	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.spice b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.spice
index 96a5460..a944eb4 100644
--- a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.spice
+++ b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.spice
@@ -16,96 +16,50 @@
 
 
 .subckt sky130_fd_sc_ms__sdfrbp_2 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 a_1370_290# a_1223_119# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=3.2444e+12p ps=2.643e+07u
-M1001 VPWR a_2607_392# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.024e+11p ps=2.78e+06u
-M1002 a_2000_74# a_852_119# a_1790_74# VNB nlowvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=4.33e+11p ps=3.08e+06u
-M1003 VGND RESET_B a_223_79# VNB nlowvt w=420000u l=150000u
-+  ad=2.20072e+12p pd=1.854e+07u as=2.751e+11p ps=2.99e+06u
-M1004 a_1790_74# a_852_119# a_1370_290# VPB pshort w=1e+06u l=180000u
-+  ad=3.816e+11p pd=3.22e+06u as=0p ps=0u
-M1005 Q_N a_1790_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1006 a_388_79# D a_310_464# VPB pshort w=640000u l=180000u
-+  ad=6.96975e+11p pd=5.83e+06u as=1.536e+11p ps=1.76e+06u
-M1007 a_1370_290# a_1223_119# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1008 VPWR a_1790_74# Q_N VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR SCE a_27_79# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1010 a_2607_392# a_1790_74# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1011 VGND RESET_B a_1401_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1012 a_310_79# a_27_79# a_223_79# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1013 a_223_79# SCD a_547_79# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1014 a_1223_119# a_852_119# a_388_79# VNB nlowvt w=420000u l=150000u
-+  ad=1.47e+11p pd=1.54e+06u as=3.906e+11p ps=3.54e+06u
-M1015 a_1323_119# a_1025_119# a_1223_119# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1016 a_2006_373# a_1790_74# a_2158_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1017 a_1790_74# a_1025_119# a_1370_290# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Q a_2607_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1019 VPWR CLK a_852_119# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1020 VPWR a_1370_290# a_1328_457# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1021 VGND CLK a_852_119# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=1.95675e+11p ps=2.05e+06u
-M1022 VPWR a_2006_373# a_1958_471# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1023 a_2006_373# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1024 a_2158_74# RESET_B VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Q_N a_1790_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1026 a_388_79# D a_310_79# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_541_483# a_27_79# a_388_79# VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1028 VPWR a_1790_74# a_2006_373# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_2607_392# a_1790_74# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
-M1030 VGND SCE a_27_79# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1031 a_547_79# SCE a_388_79# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1223_119# a_1025_119# a_388_79# VPB pshort w=420000u l=180000u
-+  ad=2.247e+11p pd=2.75e+06u as=0p ps=0u
-M1033 a_1025_119# a_852_119# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1034 a_1223_119# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_388_79# RESET_B VPWR VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1025_119# a_852_119# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1037 VGND a_1790_74# Q_N VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND a_2607_392# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_310_464# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1328_457# a_852_119# a_1223_119# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR SCD a_541_483# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_1958_471# a_1025_119# a_1790_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_1401_119# a_1370_290# a_1323_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 Q a_2607_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VGND a_2006_373# a_2000_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR SCE a_310_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X1 a_27_79# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 VGND a_852_119# a_1025_119# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_2006_373# a_1790_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X4 a_2158_74# a_1790_74# a_2006_373# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 a_388_79# a_1025_119# a_1223_119# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X6 VGND a_2607_392# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_388_79# a_852_119# a_1223_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X8 a_310_464# D a_388_79# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X9 a_1223_119# a_852_119# a_1328_457# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X10 a_223_79# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X11 a_223_79# a_27_79# a_310_79# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X12 a_388_79# SCE a_547_79# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X13 a_1401_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X14 VPWR a_2607_392# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_852_119# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VPWR RESET_B a_388_79# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X17 a_852_119# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 VPWR a_1790_74# a_2607_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X19 VGND RESET_B a_2158_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X20 VGND a_1790_74# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 Q a_2607_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 VPWR a_852_119# a_1025_119# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_1328_457# a_1370_290# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X24 a_1958_471# a_2006_373# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X25 a_1223_119# a_1025_119# a_1323_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X26 VGND a_1790_74# a_2607_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X27 a_27_79# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X28 a_541_483# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X29 a_1370_290# a_852_119# a_1790_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X30 VPWR a_1790_74# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X31 a_2000_74# a_2006_373# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X32 a_1790_74# a_1025_119# a_1958_471# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X33 VPWR RESET_B a_2006_373# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X34 a_1790_74# a_852_119# a_2000_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X35 VGND a_1223_119# a_1370_290# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X36 a_388_79# a_27_79# a_541_483# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X37 a_310_79# D a_388_79# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X38 Q a_2607_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X39 VPWR a_1223_119# a_1370_290# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X40 a_547_79# SCD a_223_79# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X41 VPWR RESET_B a_1223_119# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X42 a_1323_119# a_1370_290# a_1401_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X43 Q_N a_1790_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X44 a_1370_290# a_1025_119# a_1790_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X45 Q_N a_1790_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.cdl b/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.cdl
index a33a2ba..5b91aad 100644
--- a/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.cdl
+++ b/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_ms__sdfrtn_1 CLK_N D RESET_B SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK_N:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O
-MI642 clkpos CLK_N VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI642 clkpos CLK_N VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI636 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net87 s0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net121 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net87 s0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net114 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net121 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net114 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net102 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net182 s0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net182 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net97 net87 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI4 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI666 net137 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI34 net102 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 s0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net182 s0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net182 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net97 net87 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI666 net137 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI98 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
-MI98 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 clkpos CLK_N VPB pshort m=1 w=1 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg clkpos VPB pshort m=1 w=1 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net210 net87 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI120 db SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 clkpos CLK_N VPB pfet_01v8 m=1 w=1 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net87 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8 m=1 w=1 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net210 net87 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net87 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net87 s0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net189 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net182 s0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net182 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net87 s0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 M1 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net189 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI94 db D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net182 s0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net182 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 db RESET_B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 db RESET_B VPB pfet_01v8 m=1 w=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_ms__sdfrtn_1
diff --git a/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.netlist.tsv b/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.netlist.tsv
index b61f726..a70d35e 100644
--- a/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.netlist.tsv
+++ b/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ms__sdfrtn_1	CLK_N:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI642	MOSFET	clkpos	CLK_N	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net87	s0	net121	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net121	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net114	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net102	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net102	M1	net114	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net97	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net182	s0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net182	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net97	net87	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net137	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	db	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	net137	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	net137	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	clkpos	CLK_N	VPWR	VPB	pshort	1	1	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	1	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net210	net87	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net87	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net210	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net87	s0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net189	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net189	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net182	s0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net182	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	RESET_B	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkpos	CLK_N	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net87	s0	net121	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net121	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net114	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net102	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net102	M1	net114	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net97	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net182	s0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net182	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net97	net87	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net137	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	net137	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	net137	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	clkpos	CLK_N	VPWR	VPB	pfet_01v8	1	1	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	1	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net210	net87	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net87	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net210	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net87	s0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net189	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net189	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net182	s0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net182	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.spice b/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.spice
index 0b67c6b..ccc1d1a 100644
--- a/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.spice
+++ b/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ms__sdfrtn_1 CLK_N D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 VPWR CLK_N a_859_347# VPB pshort w=1e+06u l=180000u
-+  ad=2.14562e+12p pd=1.792e+07u as=3.25e+11p ps=2.65e+06u
-M1001 a_1273_131# a_859_347# a_287_464# VPB pshort w=420000u l=180000u
-+  ad=2.268e+11p pd=2.76e+06u as=7.8e+11p ps=6.03e+06u
-M1002 a_287_464# RESET_B VPWR VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND RESET_B a_1483_131# VNB nlowvt w=420000u l=150000u
-+  ad=1.49337e+12p pd=1.266e+07u as=8.82e+10p ps=1.26e+06u
-M1004 VGND a_2087_410# a_2073_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.05e+11p ps=1.34e+06u
-M1005 a_2045_508# a_859_347# a_1827_144# VPB pshort w=420000u l=180000u
-+  ad=9.66e+10p pd=1.3e+06u as=2.915e+11p ps=2.67e+06u
-M1006 a_538_81# SCE a_287_464# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.465e+11p ps=3.33e+06u
-M1007 VGND CLK_N a_859_347# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.442e+11p ps=2.14e+06u
-M1008 a_1069_74# a_859_347# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.257e+11p pd=2.09e+06u as=0p ps=0u
-M1009 a_2265_74# RESET_B VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1010 a_2087_410# a_1827_144# a_2265_74# VNB nlowvt w=420000u l=150000u
-+  ad=2.1e+11p pd=1.84e+06u as=0p ps=0u
-M1011 VPWR SCE a_27_88# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1012 a_209_464# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1013 VPWR a_2087_410# a_2045_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Q a_2492_424# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.192e+11p pd=2.81e+06u as=0p ps=0u
-M1015 a_474_464# a_27_88# a_287_464# VPB pshort w=640000u l=180000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1016 a_1483_131# a_1417_294# a_1409_131# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=9.24e+10p ps=1.28e+06u
-M1017 Q a_2492_424# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1018 a_324_81# a_27_88# a_239_81# VNB nlowvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.373e+11p ps=2.81e+06u
-M1019 a_2087_410# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1020 a_287_464# D a_324_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1273_131# a_1069_74# a_287_464# VNB nlowvt w=420000u l=150000u
-+  ad=2.226e+11p pd=1.9e+06u as=0p ps=0u
-M1022 VPWR a_1827_144# a_2087_410# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND RESET_B a_239_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1381_457# a_1069_74# a_1273_131# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1025 VPWR a_1827_144# a_2492_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1026 a_2073_74# a_1069_74# a_1827_144# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=6.59025e+11p ps=4.26e+06u
-M1027 VGND a_1827_144# a_2492_424# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1028 a_1409_131# a_859_347# a_1273_131# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1069_74# a_859_347# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1030 a_1273_131# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1827_144# a_1069_74# a_1417_294# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=7.55e+11p ps=3.51e+06u
-M1032 a_239_81# SCD a_538_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_1417_294# a_1381_457# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_287_464# D a_209_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1417_294# a_1273_131# VGND VNB nlowvt w=640000u l=150000u
-+  ad=3.584e+11p pd=2.4e+06u as=0p ps=0u
-M1036 VPWR SCD a_474_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND SCE a_27_88# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1038 a_1417_294# a_1273_131# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_1827_144# a_859_347# a_1417_294# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_859_347# a_1069_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 a_2492_424# a_1827_144# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X2 a_1273_131# a_859_347# a_1409_131# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 a_287_464# a_859_347# a_1273_131# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X4 a_2045_508# a_2087_410# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X5 a_324_81# D a_287_464# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X6 a_287_464# SCE a_538_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 VGND a_1273_131# a_1417_294# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_209_464# D a_287_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X9 a_474_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X10 a_859_347# CLK_N VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VGND a_859_347# a_1069_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VPWR a_1273_131# a_1417_294# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 a_287_464# a_1069_74# a_1273_131# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X14 a_1827_144# a_1069_74# a_2073_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X15 VPWR RESET_B a_2087_410# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X16 a_27_88# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X17 a_859_347# CLK_N VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 a_1273_131# a_1069_74# a_1381_457# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X19 a_2492_424# a_1827_144# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X20 VPWR RESET_B a_1273_131# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X21 a_2265_74# a_1827_144# a_2087_410# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X22 VGND a_2492_424# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_1381_457# a_1417_294# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X24 VGND RESET_B a_2265_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X25 a_1409_131# a_1417_294# a_1483_131# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X26 a_1483_131# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 VPWR RESET_B a_287_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X28 a_1417_294# a_1069_74# a_1827_144# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X29 a_1417_294# a_859_347# a_1827_144# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X30 a_1827_144# a_859_347# a_2045_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X31 a_239_81# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X32 a_2087_410# a_1827_144# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X33 a_239_81# a_27_88# a_324_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X34 a_538_81# SCD a_239_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X35 a_27_88# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X36 VPWR a_2492_424# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X37 a_2073_74# a_2087_410# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X38 VPWR SCE a_209_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X39 a_287_464# a_27_88# a_474_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
 .ends
diff --git a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.cdl b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.cdl
index 1562228..749a8f1 100644
--- a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.cdl
+++ b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_ms__sdfrtp_1 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O
-MI642 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net127 s0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net89 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net98 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net127 s0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net110 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net198 s0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net198 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net113 net127 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net89 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net98 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI666 net153 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI634 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 net110 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 s0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net198 s0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net198 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net113 net127 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI666 net153 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI98 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
-MI98 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI120 db SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net170 net127 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net127 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI662 net170 net127 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net127 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net127 s0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net189 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net198 s0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net198 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net127 s0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 M1 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net189 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI94 db D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net198 s0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net198 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 db RESET_B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 db RESET_B VPB pfet_01v8 m=1 w=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_ms__sdfrtp_1
diff --git a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.netlist.tsv b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.netlist.tsv
index 64ec4b0..f3b2e62 100644
--- a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.netlist.tsv
+++ b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ms__sdfrtp_1	CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI642	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net127	s0	net89	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net89	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net98	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net110	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net110	M1	net98	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net113	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net198	s0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net198	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net113	net127	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net153	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	db	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	net153	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	net153	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net170	net127	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net127	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net170	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net127	s0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net189	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net189	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net198	s0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net198	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	RESET_B	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net127	s0	net89	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net89	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net98	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net110	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net110	M1	net98	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net113	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net198	s0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net198	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net113	net127	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net153	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	net153	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	net153	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net170	net127	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net127	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net170	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net127	s0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net189	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net189	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net198	s0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net198	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.spice b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.spice
index 4bf9681..59f5696 100644
--- a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.spice
+++ b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ms__sdfrtp_1 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 a_1234_119# a_1037_387# a_303_464# VPB pshort w=420000u l=180000u
-+  ad=2.576e+11p pd=2.93e+06u as=9.24e+11p ps=6.48e+06u
-M1001 a_1320_119# a_1037_387# a_1234_119# VNB nlowvt w=420000u l=150000u
-+  ad=9.87e+10p pd=1.31e+06u as=1.176e+11p ps=1.4e+06u
-M1002 a_219_464# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=2.08418e+12p ps=1.846e+07u
-M1003 VGND a_1997_272# a_1972_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.60052e+12p pd=1.375e+07u as=8.82e+10p ps=1.26e+06u
-M1004 a_1972_74# a_835_93# a_1745_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=4.687e+11p ps=3.25e+06u
-M1005 VPWR SCE a_27_88# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1006 a_1745_74# a_1037_387# a_1367_93# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1007 Q a_2402_424# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1008 a_312_81# a_27_88# a_225_81# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.499e+11p ps=2.87e+06u
-M1009 a_303_464# D a_312_81# VNB nlowvt w=420000u l=150000u
-+  ad=3.738e+11p pd=3.46e+06u as=0p ps=0u
-M1010 a_1234_119# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Q a_2402_424# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1012 VGND RESET_B a_1397_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1013 a_303_464# D a_219_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1996_508# a_1037_387# a_1745_74# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=4.21675e+11p ps=3.58e+06u
-M1015 a_225_81# SCD a_545_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1016 a_535_464# a_27_88# a_303_464# VPB pshort w=640000u l=180000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1017 a_1346_461# a_835_93# a_1234_119# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1018 VPWR CLK a_835_93# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1019 VPWR SCD a_535_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1397_119# a_1367_93# a_1320_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1997_272# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1022 a_1997_272# a_1745_74# a_2135_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1023 a_303_464# RESET_B VPWR VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_1745_74# a_1997_272# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_545_81# SCE a_303_464# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1367_93# a_1234_119# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1027 a_2402_424# a_1745_74# VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1028 VPWR a_1367_93# a_1346_461# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND CLK a_835_93# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.8265e+11p ps=2.43e+06u
-M1030 a_1037_387# a_835_93# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1031 a_1745_74# a_835_93# a_1367_93# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1037_387# a_835_93# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1033 a_1367_93# a_1234_119# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND SCE a_27_88# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1035 a_1234_119# a_835_93# a_303_464# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND RESET_B a_225_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR a_1997_272# a_1996_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_2135_74# RESET_B VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_2402_424# a_1745_74# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
+X0 a_835_93# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_1397_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 a_1972_74# a_1997_272# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 a_225_81# a_27_88# a_312_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 a_1367_93# a_1037_387# a_1745_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_1234_119# a_835_93# a_1346_461# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X6 a_1745_74# a_835_93# a_1972_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 VPWR a_1234_119# a_1367_93# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_1234_119# a_1037_387# a_1320_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 VGND a_2402_424# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_835_93# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VPWR RESET_B a_1997_272# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X12 a_545_81# SCD a_225_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X13 a_1996_508# a_1997_272# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X14 VPWR a_835_93# a_1037_387# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_27_88# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X16 a_535_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X17 VGND a_1745_74# a_2402_424# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X18 a_1745_74# a_1037_387# a_1996_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X19 a_303_464# a_835_93# a_1234_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X20 a_1320_119# a_1367_93# a_1397_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X21 VPWR RESET_B a_303_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X22 VGND RESET_B a_2135_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X23 a_303_464# SCE a_545_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X24 VPWR SCE a_219_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X25 a_2135_74# a_1745_74# a_1997_272# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X26 a_1367_93# a_835_93# a_1745_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X27 a_303_464# a_1037_387# a_1234_119# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X28 VGND a_835_93# a_1037_387# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 VPWR a_1745_74# a_2402_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X30 a_219_464# D a_303_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X31 a_1346_461# a_1367_93# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X32 a_225_81# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X33 a_1997_272# a_1745_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X34 a_303_464# a_27_88# a_535_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X35 VGND a_1234_119# a_1367_93# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X36 VPWR RESET_B a_1234_119# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X37 a_27_88# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X38 a_312_81# D a_303_464# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X39 VPWR a_2402_424# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.cdl b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.cdl
index 7a525b6..4e5931e 100644
--- a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.cdl
+++ b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_ms__sdfrtp_2 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O
-MI642 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net127 s0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net89 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net98 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net127 s0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net110 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net198 s0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net198 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net113 net127 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net89 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net98 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI666 net153 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI634 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 net110 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 s0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net198 s0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net198 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net113 net127 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI666 net153 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI98 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
-MI98 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI120 db SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net170 net127 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net127 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI662 net170 net127 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net127 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net127 s0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net189 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net198 s0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net198 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net127 s0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 M1 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net189 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI94 db D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net198 s0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net198 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 db RESET_B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 db RESET_B VPB pfet_01v8 m=1 w=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_ms__sdfrtp_2
diff --git a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.netlist.tsv b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.netlist.tsv
index cd99bef..884e46d 100644
--- a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.netlist.tsv
+++ b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ms__sdfrtp_2	CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI642	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net127	s0	net89	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net89	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net98	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net110	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net110	M1	net98	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net113	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net198	s0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net198	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net113	net127	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net153	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	db	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	net153	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	net153	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net170	net127	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net127	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net170	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net127	s0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net189	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net189	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net198	s0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net198	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	RESET_B	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net127	s0	net89	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net89	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net98	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net110	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net110	M1	net98	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net113	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net198	s0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net198	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net113	net127	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net153	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	net153	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	net153	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net170	net127	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net127	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net170	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net127	s0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net189	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net189	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net198	s0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net198	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.spice b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.spice
index f759b27..c8ea7b4 100644
--- a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.spice
+++ b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.spice
@@ -16,88 +16,46 @@
 
 
 .subckt sky130_fd_sc_ms__sdfrtp_2 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 a_390_81# D a_343_483# VPB pshort w=640000u l=180000u
-+  ad=5.4e+11p pd=5.28e+06u as=1.472e+11p ps=1.74e+06u
-M1001 VPWR a_2495_392# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=2.9811e+12p pd=2.35e+07u as=3.024e+11p ps=2.78e+06u
-M1002 a_1235_119# a_1037_119# a_390_81# VPB pshort w=420000u l=180000u
-+  ad=2.394e+11p pd=2.82e+06u as=0p ps=0u
-M1003 Q a_2495_392# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=2.0718e+12p ps=1.661e+07u
-M1004 VGND RESET_B a_225_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.52e+11p ps=2.88e+06u
-M1005 VPWR a_2082_446# a_2040_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 a_1383_349# a_1235_119# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=4.6755e+11p pd=3.07e+06u as=0p ps=0u
-M1007 VGND RESET_B a_1432_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1008 a_547_81# SCE a_390_81# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.927e+11p ps=3.55e+06u
-M1009 a_2078_74# a_837_119# a_1824_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=5.504e+11p ps=3.72e+06u
-M1010 VGND a_2082_446# a_2078_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR SCE a_27_74# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1012 a_343_483# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1235_119# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_312_81# a_27_74# a_225_81# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1015 a_390_81# D a_312_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND CLK a_837_119# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.0225e+11p ps=2.04e+06u
-M1017 a_1037_119# a_837_119# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.998e+11p pd=2.02e+06u as=0p ps=0u
-M1018 a_2082_446# a_1824_74# a_2242_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1019 a_2082_446# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1020 a_1824_74# a_837_119# a_1383_349# VPB pshort w=1e+06u l=180000u
-+  ad=4.2595e+11p pd=3.6e+06u as=0p ps=0u
-M1021 a_2040_508# a_1037_119# a_1824_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1432_119# a_1383_349# a_1354_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1023 a_390_81# RESET_B VPWR VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_1824_74# a_2082_446# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1339_457# a_837_119# a_1235_119# VPB pshort w=420000u l=180000u
-+  ad=9.24e+10p pd=1.28e+06u as=0p ps=0u
-M1026 a_2242_74# RESET_B VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR CLK a_837_119# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1028 a_1824_74# a_1037_119# a_1383_349# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.627e+11p ps=2.19e+06u
-M1029 a_2495_392# a_1824_74# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1030 VGND a_2495_392# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1235_119# a_837_119# a_390_81# VNB nlowvt w=420000u l=150000u
-+  ad=1.869e+11p pd=1.73e+06u as=0p ps=0u
-M1032 a_1354_119# a_1037_119# a_1235_119# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_1383_349# a_1339_457# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1037_119# a_837_119# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1035 a_225_81# SCD a_547_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND SCE a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1037 a_2495_392# a_1824_74# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1038 a_517_483# a_27_74# a_390_81# VPB pshort w=640000u l=180000u
-+  ad=2.304e+11p pd=2e+06u as=0p ps=0u
-M1039 VPWR SCD a_517_483# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1383_349# a_1235_119# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 Q a_2495_392# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_547_81# SCD a_225_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X1 a_1235_119# a_837_119# a_1339_457# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X2 a_225_81# a_27_74# a_312_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 Q a_2495_392# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VGND a_837_119# a_1037_119# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_1235_119# a_1037_119# a_1354_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X6 a_837_119# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VPWR a_1824_74# a_2495_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 a_2082_446# a_1824_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X9 VPWR a_837_119# a_1037_119# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_27_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X11 a_517_483# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X12 a_225_81# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X13 a_2040_508# a_2082_446# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X14 a_390_81# SCE a_547_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X15 Q a_2495_392# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_1339_457# a_1383_349# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X17 a_390_81# a_837_119# a_1235_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X18 a_1383_349# a_837_119# a_1824_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X19 VPWR a_2495_392# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 VGND a_2495_392# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 VPWR RESET_B a_1235_119# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X22 a_1824_74# a_1037_119# a_2040_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X23 a_1383_349# a_1037_119# a_1824_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_2078_74# a_2082_446# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X25 a_1824_74# a_837_119# a_2078_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X26 a_390_81# a_27_74# a_517_483# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X27 VPWR RESET_B a_390_81# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X28 a_837_119# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 VPWR a_1235_119# a_1383_349# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X30 VGND a_1824_74# a_2495_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X31 a_390_81# a_1037_119# a_1235_119# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X32 VPWR RESET_B a_2082_446# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X33 a_1354_119# a_1383_349# a_1432_119# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X34 VGND RESET_B a_2242_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X35 a_1432_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X36 a_2242_74# a_1824_74# a_2082_446# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X37 VGND a_1235_119# a_1383_349# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X38 VPWR SCE a_343_483# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X39 a_343_483# D a_390_81# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X40 a_27_74# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X41 a_312_81# D a_390_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.cdl b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.cdl
index e4b158a..f25b8e9 100644
--- a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.cdl
+++ b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_ms__sdfrtp_4 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O
-MI642 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net127 s0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net89 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net98 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net127 s0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net110 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net198 s0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net198 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net113 net127 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net89 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net98 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI666 net153 RESET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI634 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 net110 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 s0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net198 s0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net198 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net113 net127 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI666 net153 RESET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI98 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
-MI98 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI120 db SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net170 net127 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net127 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI662 net170 net127 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net127 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net127 s0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net189 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net198 s0 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net198 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net127 s0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 M1 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net189 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI94 db D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net198 s0 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net198 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 db RESET_B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 db RESET_B VPB pfet_01v8 m=1 w=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_ms__sdfrtp_4
diff --git a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.netlist.tsv b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.netlist.tsv
index cece94e..95b1811 100644
--- a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.netlist.tsv
+++ b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ms__sdfrtp_4	CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI642	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net127	s0	net89	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net89	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net98	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net110	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net110	M1	net98	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net113	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net198	s0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net198	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net113	net127	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net153	RESET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	db	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	net153	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	net153	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net170	net127	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net127	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net170	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net127	s0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net189	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net189	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net198	s0	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net198	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	RESET_B	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net127	s0	net89	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net89	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net98	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net110	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net110	M1	net98	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net113	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net198	s0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net198	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net113	net127	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net153	RESET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	net153	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	net153	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net170	net127	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net127	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net170	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net127	s0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net189	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net189	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net198	s0	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net198	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.spice b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.spice
index 8b223a2..f946bd9 100644
--- a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.spice
+++ b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.spice
@@ -16,98 +16,51 @@
 
 
 .subckt sky130_fd_sc_ms__sdfrtp_4 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 a_1397_138# a_1367_112# a_1319_138# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.008e+11p ps=1.32e+06u
-M1001 VPWR a_1745_74# a_2339_74# VPB pshort w=840000u l=180000u
-+  ad=3.24455e+12p pd=2.618e+07u as=2.268e+11p ps=2.22e+06u
-M1002 VPWR a_1367_112# a_1345_463# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1003 a_1233_138# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=2.52e+11p pd=2.88e+06u as=0p ps=0u
-M1004 VPWR SCE a_27_74# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1005 a_225_81# SCD a_555_81# VNB nlowvt w=420000u l=150000u
-+  ad=2.583e+11p pd=2.91e+06u as=8.82e+10p ps=1.26e+06u
-M1006 a_1745_74# a_1037_387# a_1367_112# VNB nlowvt w=640000u l=150000u
-+  ad=4.33e+11p pd=3.08e+06u as=2.33e+11p ps=2.13e+06u
-M1007 a_312_81# a_27_74# a_225_81# VNB nlowvt w=420000u l=150000u
-+  ad=1.533e+11p pd=1.57e+06u as=0p ps=0u
-M1008 a_415_81# D a_312_81# VNB nlowvt w=420000u l=150000u
-+  ad=3.423e+11p pd=3.31e+06u as=0p ps=0u
-M1009 VGND a_2339_74# Q VNB nlowvt w=740000u l=150000u
-+  ad=2.376e+12p pd=1.764e+07u as=4.144e+11p ps=4.08e+06u
-M1010 VPWR a_2003_48# a_1985_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1011 VGND a_1745_74# a_2339_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1012 a_1345_463# a_834_93# a_1233_138# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND RESET_B a_225_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1985_508# a_1037_387# a_1745_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=4.06975e+11p ps=3.51e+06u
-M1015 Q a_2339_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1016 a_1233_138# a_1037_387# a_415_81# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=4.728e+11p ps=5.07e+06u
-M1017 a_1319_138# a_1037_387# a_1233_138# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1018 a_1367_112# a_1233_138# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1019 VPWR a_2339_74# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Q a_2339_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_415_81# D a_343_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1022 a_1745_74# a_834_93# a_1367_112# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Q a_2339_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_517_464# a_27_74# a_415_81# VPB pshort w=640000u l=180000u
-+  ad=2.432e+11p pd=2.04e+06u as=0p ps=0u
-M1025 a_555_81# SCE a_415_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR CLK a_834_93# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1027 a_1233_138# a_834_93# a_415_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1367_112# a_1233_138# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_2339_74# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_2003_48# a_1745_74# a_2141_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=8.82e+10p ps=1.26e+06u
-M1031 a_2003_48# RESET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=1.491e+11p pd=1.55e+06u as=0p ps=0u
-M1032 VGND a_2003_48# a_1955_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1033 Q a_2339_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND RESET_B a_1397_138# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_415_81# RESET_B VPWR VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1955_74# a_834_93# a_1745_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND a_2339_74# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND CLK a_834_93# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.7955e+11p ps=2.44e+06u
-M1039 a_343_464# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1037_387# a_834_93# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1041 a_1037_387# a_834_93# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.924e+11p pd=2e+06u as=0p ps=0u
-M1042 VGND SCE a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1043 VPWR SCD a_517_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VPWR a_1745_74# a_2003_48# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_2141_74# RESET_B VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_2339_74# a_1745_74# VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_834_93# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_225_81# a_27_74# a_312_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 a_225_81# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 a_1367_112# a_1037_387# a_1745_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 Q a_2339_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VPWR a_1745_74# a_2339_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X6 a_1955_74# a_2003_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 Q a_2339_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_343_464# D a_415_81# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X9 a_517_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X10 a_2003_48# a_1745_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X11 VGND RESET_B a_2141_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X12 a_834_93# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_2141_74# a_1745_74# a_2003_48# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X14 VPWR RESET_B a_2003_48# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X15 VPWR a_834_93# a_1037_387# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_27_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X17 a_1745_74# a_1037_387# a_1985_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X18 a_1233_138# a_1037_387# a_1319_138# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X19 VPWR a_1233_138# a_1367_112# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X20 a_312_81# D a_415_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X21 a_2339_74# a_1745_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 VGND a_2339_74# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_1345_463# a_1367_112# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X24 VPWR a_2339_74# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 a_415_81# a_1037_387# a_1233_138# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X26 a_1397_138# RESET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 VPWR RESET_B a_1233_138# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X28 VPWR a_2339_74# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X29 Q a_2339_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X30 a_2339_74# a_1745_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X31 a_1745_74# a_834_93# a_1955_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X32 a_415_81# a_27_74# a_517_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X33 Q a_2339_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 a_415_81# SCE a_555_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X35 VGND a_2339_74# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X36 a_1233_138# a_834_93# a_1345_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X37 VGND a_834_93# a_1037_387# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X38 a_555_81# SCD a_225_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X39 VPWR RESET_B a_415_81# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X40 a_1985_508# a_2003_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X41 a_415_81# a_834_93# a_1233_138# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X42 a_1367_112# a_834_93# a_1745_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X43 VPWR SCE a_343_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X44 a_27_74# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X45 a_1319_138# a_1367_112# a_1397_138# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X46 VGND a_1233_138# a_1367_112# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.cdl b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.cdl
index 2f26090..227f191 100644
--- a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.cdl
+++ b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.cdl
@@ -17,88 +17,88 @@
 .SUBCKT sky130_fd_sc_ms__sdfsbp_1 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI94 db D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI101 db sceb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net95 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net114 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N S0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net223 S0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI662 net95 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net223 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net159 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI120 db SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI98 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI27 net179 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI664 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net114 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net226 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net223 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net207 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI45 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI669 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 M1 M0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI661 Q_N S0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI659 M1 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 sceb SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net223 S0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net223 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net223 S0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI648 S1 S0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 S0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net214 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI37 net159 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net235 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI120 db SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI98 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI27 net179 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 S1 S0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net226 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net223 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net207 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 Q_N S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net223 S0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M1 M0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net214 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 net235 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__sdfsbp_1
diff --git a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.netlist.tsv b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.netlist.tsv
index df257b8..a77672d 100644
--- a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.netlist.tsv
+++ b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_ms__sdfsbp_1	CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net95	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net95	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net114	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net114	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	S0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net223	S0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net223	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net159	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net159	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI120	MOSFET	db	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	db	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI27	MOSFET	net179	S1	net207	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net235	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net226	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net223	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net207	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	S0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net214	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net223	S0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net226	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net214	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net235	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net179	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net95	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net95	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net114	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkpos	net114	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	S0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net223	S0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net223	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net159	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net159	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI27	MOSFET	net179	S1	net207	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net235	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net226	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net223	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net207	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	S0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net214	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net223	S0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net226	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net214	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net235	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net179	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.spice b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.spice
index aab109d..a29c896 100644
--- a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.spice
+++ b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.spice
@@ -16,88 +16,46 @@
 
 
 .subckt sky130_fd_sc_ms__sdfsbp_1 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
-M1000 Q_N a_1762_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.08e+11p pd=2.79e+06u as=1.9498e+12p ps=1.823e+07u
-M1001 a_1411_74# a_995_74# a_1163_48# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1002 a_419_464# a_27_74# a_293_464# VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=4.014e+11p ps=3.56e+06u
-M1003 a_1876_74# a_594_74# a_1762_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.391e+11p ps=2.12e+06u
-M1004 a_1954_74# a_1924_48# a_1876_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1005 VGND a_1163_48# a_1115_74# VNB nlowvt w=420000u l=150000u
-+  ad=2.17215e+12p pd=1.688e+07u as=1.008e+11p ps=1.32e+06u
-M1006 a_1924_48# a_1762_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1007 a_1115_74# a_781_74# a_995_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.89e+11p ps=1.74e+06u
-M1008 a_1603_347# a_594_74# a_1762_74# VPB pshort w=1e+06u l=180000u
-+  ad=5.5e+11p pd=5.1e+06u as=4.117e+11p ps=4.11e+06u
-M1009 Q_N a_1762_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1010 VPWR SCE a_27_74# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1011 a_209_464# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1012 VGND SET_B a_1954_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR SCD a_419_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND SET_B a_1411_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_392_74# SCE a_293_464# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.0425e+11p ps=3.2e+06u
-M1016 VGND SCD a_392_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_293_464# D a_209_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_1762_74# a_2556_112# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1019 a_781_74# a_594_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1020 a_1136_478# a_594_74# a_995_74# VPB pshort w=420000u l=180000u
-+  ad=1.548e+11p pd=1.67e+06u as=1.99125e+11p ps=1.84e+06u
-M1021 VPWR a_1163_48# a_1136_478# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_995_74# a_781_74# a_293_464# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND CLK a_594_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1024 a_1684_74# a_995_74# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1025 a_1762_74# a_781_74# a_1684_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR CLK a_594_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.08e+11p ps=2.79e+06u
-M1027 Q a_2556_112# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1028 VPWR a_1924_48# a_1712_374# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=3.618e+11p ps=4.39e+06u
-M1029 VPWR a_1762_74# a_1924_48# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1030 a_781_74# a_594_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1031 Q a_2556_112# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1032 a_1762_74# SET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1762_74# a_781_74# a_1712_374# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR a_1762_74# a_2556_112# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.31e+11p ps=2.23e+06u
-M1035 VPWR SET_B a_1163_48# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.722e+11p ps=1.66e+06u
-M1036 VGND SCE a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1037 a_995_74# a_594_74# a_293_464# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1163_48# a_995_74# VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_228_74# a_27_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1040 a_293_464# D a_228_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_1603_347# a_995_74# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1924_48# a_1762_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X1 a_293_464# a_781_74# a_995_74# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X2 a_1712_374# a_1924_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X3 a_293_464# a_27_74# a_419_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X4 VPWR a_1762_74# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_209_464# D a_293_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X6 VPWR a_594_74# a_781_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 a_995_74# a_594_74# a_1136_478# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X8 a_419_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X9 a_228_74# D a_293_464# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 a_1163_48# SET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X11 VGND a_27_74# a_228_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X12 VPWR a_995_74# a_1603_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 a_2556_112# a_1762_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X14 a_27_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X15 a_1954_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X16 VGND a_2556_112# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_392_74# SCD VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X18 a_1411_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X19 a_1712_374# a_781_74# a_1762_74# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X20 a_2556_112# a_1762_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X21 a_1136_478# a_1163_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X22 a_293_464# SCE a_392_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X23 VPWR a_2556_112# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_1684_74# a_781_74# a_1762_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X25 a_594_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 VPWR SET_B a_1762_74# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X27 VGND a_1762_74# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 VGND a_995_74# a_1684_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X29 VGND a_1762_74# a_1924_48# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X30 VGND a_594_74# a_781_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 a_1762_74# a_594_74# a_1603_347# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X32 a_293_464# a_594_74# a_995_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X33 a_1876_74# a_1924_48# a_1954_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X34 a_1163_48# a_995_74# a_1411_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X35 a_1762_74# a_594_74# a_1876_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X36 a_594_74# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X37 a_1115_74# a_1163_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X38 VPWR a_995_74# a_1163_48# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X39 a_27_74# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X40 VPWR SCE a_209_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X41 a_995_74# a_781_74# a_1115_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.cdl b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.cdl
index 5d899f6..0154658 100644
--- a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.cdl
+++ b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.cdl
@@ -17,88 +17,88 @@
 .SUBCKT sky130_fd_sc_ms__sdfsbp_2 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI101 db sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI101 db sceb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI94 db D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI645 sceb SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net227 S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI658 M1 M0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net227 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net122 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net130 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net147 M0 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N S0 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI34 S0 clkpos VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net183 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net199 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net203 M0 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI47 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net223 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI663 net227 S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net227 S0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net235 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI660 Q net227 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net227 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI659 M1 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net122 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net130 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N S0 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI669 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net147 M0 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N S0 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI34 S0 clkpos VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net183 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 S1 S0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M1 M0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net199 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 net203 M0 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net223 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net227 S0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net235 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net227 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 Q_N S0 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__sdfsbp_2
diff --git a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.netlist.tsv b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.netlist.tsv
index b931fa1..d9c86f7 100644
--- a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.netlist.tsv
+++ b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_ms__sdfsbp_2	CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI101	MOSFET	db	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net227	S0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net227	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net122	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net122	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net130	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net130	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net147	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net147	M0	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	S0	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI98	MOSFET	db	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI34	MOSFET	S0	clkpos	net203	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net183	S1	net235	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net199	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net223	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net199	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net203	M0	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net183	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net223	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net227	S0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net235	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net227	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	S0	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net227	S0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net227	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net122	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net122	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net130	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkpos	net130	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net147	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net147	M0	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	S0	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI34	MOSFET	S0	clkpos	net203	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net183	S1	net235	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net199	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net223	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net199	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net203	M0	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net183	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net223	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net227	S0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net235	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net227	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	S0	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.spice b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.spice
index 5108a3f..60e38ba 100644
--- a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.spice
+++ b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.spice
@@ -16,104 +16,54 @@
 
 
 .subckt sky130_fd_sc_ms__sdfsbp_2 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
-M1000 VPWR a_2067_74# a_3177_368# VPB pshort w=1e+06u l=180000u
-+  ad=3.4604e+12p pd=2.71e+07u as=2.8e+11p ps=2.56e+06u
-M1001 VGND a_3177_368# Q VNB nlowvt w=740000u l=150000u
-+  ad=2.2419e+12p pd=2.069e+07u as=2.072e+11p ps=2.04e+06u
-M1002 a_1204_463# a_619_368# a_1069_81# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.344e+11p ps=1.48e+06u
-M1003 a_1789_424# a_1069_81# VPWR VPB pshort w=840000u l=180000u
-+  ad=7.392e+11p pd=6.8e+06u as=0p ps=0u
-M1004 Q_N a_2067_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1005 VGND a_1069_81# a_1794_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=6.208e+11p ps=5.78e+06u
-M1006 a_1069_81# a_871_74# a_307_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=3.672e+11p ps=3.46e+06u
-M1007 a_223_464# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1008 a_2501_74# a_619_368# a_2067_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=5.999e+11p ps=4.61e+06u
-M1009 VPWR SCE a_27_74# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1010 a_2067_74# a_871_74# a_2277_455# VPB pshort w=420000u l=180000u
-+  ad=4.62e+11p pd=5.02e+06u as=2.373e+11p ps=2.81e+06u
-M1011 a_1794_74# a_1069_81# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_2067_74# a_3177_368# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1013 a_1567_74# a_1069_81# a_1252_376# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1014 VGND SET_B a_1567_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND SCD a_495_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1016 VPWR a_2513_258# a_2277_455# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_495_74# SCE a_307_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=4.515e+11p ps=3.83e+06u
-M1018 a_2067_74# SET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1069_81# a_619_368# a_307_74# VNB nlowvt w=420000u l=150000u
-+  ad=3.675e+11p pd=2.59e+06u as=0p ps=0u
-M1020 a_2579_74# a_2513_258# a_2501_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1021 VGND SET_B a_2579_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Q a_3177_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Q_N a_2067_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.22e+11p pd=2.08e+06u as=0p ps=0u
-M1024 VGND a_1252_376# a_1274_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1025 VGND a_2067_74# Q_N VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1274_81# a_871_74# a_1069_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_421_464# a_27_74# a_307_74# VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1028 a_2067_74# a_619_368# a_1789_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_2067_74# Q_N VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_1252_376# a_1204_463# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1789_424# a_619_368# a_2067_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1794_74# a_871_74# a_2067_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_307_74# D a_223_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR SET_B a_1252_376# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.554e+11p ps=1.58e+06u
-M1035 a_871_74# a_619_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1036 VPWR CLK a_619_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1037 a_229_74# a_27_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1038 a_307_74# D a_229_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_2067_74# a_871_74# a_1794_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_2513_258# a_2067_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1041 VPWR SCD a_421_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_1252_376# a_1069_81# VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND CLK a_619_368# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1044 VGND SCE a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1045 VPWR a_2067_74# a_2513_258# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1046 a_871_74# a_619_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.528e+11p pd=2.87e+06u as=0p ps=0u
-M1047 Q a_3177_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1048 VPWR a_1069_81# a_1789_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VPWR a_3177_368# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_3177_368# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VGND a_3177_368# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 VPWR a_619_368# a_871_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Q_N a_2067_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_229_74# D a_307_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 a_3177_368# a_2067_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_1204_463# a_1252_376# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X7 VGND a_27_74# a_229_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X8 VPWR SET_B a_2067_74# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X9 a_1789_424# a_619_368# a_2067_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X10 a_1567_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X11 VGND a_1069_81# a_1794_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 a_2579_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X13 a_307_74# a_871_74# a_1069_81# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X14 a_2513_258# a_2067_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X15 a_1252_376# a_1069_81# a_1567_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X16 a_2501_74# a_2513_258# a_2579_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X17 VGND a_619_368# a_871_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_1789_424# a_1069_81# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X19 a_307_74# a_619_368# a_1069_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X20 a_2067_74# a_871_74# a_1794_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X21 VGND a_2067_74# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 a_1069_81# a_619_368# a_1204_463# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X23 Q a_3177_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_223_464# D a_307_74# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X25 a_1794_74# a_1069_81# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X26 a_3177_368# a_2067_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X27 a_27_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X28 a_619_368# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_1274_81# a_1252_376# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X30 a_307_74# a_27_74# a_421_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X31 a_1069_81# a_871_74# a_1274_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X32 a_2277_455# a_2513_258# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X33 a_1794_74# a_871_74# a_2067_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X34 Q_N a_2067_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X35 a_2067_74# a_619_368# a_2501_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X36 a_495_74# SCD VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X37 a_2067_74# a_619_368# a_1789_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X38 a_2277_455# a_871_74# a_2067_74# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X39 VPWR a_2067_74# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X40 VGND a_2067_74# a_2513_258# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X41 a_421_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X42 a_1252_376# SET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X43 a_619_368# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X44 a_307_74# SCE a_495_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X45 Q a_3177_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X46 VPWR SCE a_223_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X47 a_27_74# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X48 VPWR a_1069_81# a_1789_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X49 VPWR a_1069_81# a_1252_376# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
 .ends
diff --git a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.cdl b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.cdl
index b86bc39..d047da6 100644
--- a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.cdl
+++ b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.cdl
@@ -16,84 +16,84 @@
 
 .SUBCKT sky130_fd_sc_ms__sdfstp_1 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI645 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI645 sceb SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net201 S0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI658 M1 M0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net201 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net100 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net108 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net120 M0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net157 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net164 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net152 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI47 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net168 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI663 net201 S0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net201 S0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net209 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI660 Q net201 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net201 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI659 M1 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net100 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net108 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI669 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net120 M0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net157 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 S1 S0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M1 M0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net164 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 net152 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net168 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net201 S0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net209 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net201 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
 .ENDS sky130_fd_sc_ms__sdfstp_1
diff --git a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.netlist.tsv b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.netlist.tsv
index 822e393..4f606f7 100644
--- a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.netlist.tsv
+++ b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ms__sdfstp_1	CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI645	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net201	S0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net201	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net100	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net100	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net108	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net108	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net120	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net120	M0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net152	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net157	S1	net209	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net164	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net168	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net164	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net152	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net157	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net168	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net201	S0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net209	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net201	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI98	MOSFET	db	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI645	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net201	S0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net201	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net100	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net100	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net108	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkpos	net108	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net120	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net120	M0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net152	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net157	S1	net209	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net164	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net168	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net164	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net152	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net157	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net168	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net201	S0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net209	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net201	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
diff --git a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.spice b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.spice
index 4280a05..2c5678c 100644
--- a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.spice
+++ b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ms__sdfstp_1 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
-M1000 a_1686_74# a_998_81# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.66425e+12p ps=1.358e+07u
-M1001 a_1764_74# a_800_74# a_1686_74# VNB nlowvt w=640000u l=150000u
-+  ad=3.547e+11p pd=2.44e+06u as=0p ps=0u
-M1002 a_998_81# a_800_74# a_292_464# VPB pshort w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=4.056e+11p ps=3.58e+06u
-M1003 a_238_74# a_27_464# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1004 VGND SCD a_402_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1005 a_402_74# SCE a_292_464# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.373e+11p ps=2.81e+06u
-M1006 VGND CLK a_599_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1007 a_1613_341# a_998_81# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=5.35e+11p pd=5.07e+06u as=2.003e+12p ps=1.815e+07u
-M1008 a_1988_74# a_1958_48# a_1910_74# VNB nlowvt w=420000u l=150000u
-+  ad=3.192e+11p pd=2.36e+06u as=1.008e+11p ps=1.32e+06u
-M1009 VGND a_1198_55# a_1150_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1010 a_1131_457# a_599_74# a_998_81# VPB pshort w=420000u l=180000u
-+  ad=1.407e+11p pd=1.51e+06u as=0p ps=0u
-M1011 a_1150_81# a_800_74# a_998_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.562e+11p ps=2.06e+06u
-M1012 VGND SET_B a_1426_118# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1013 a_418_464# a_27_464# a_292_464# VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1014 a_998_81# a_599_74# a_292_464# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_800_74# a_599_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1016 a_1613_341# a_599_74# a_1764_74# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=4.18e+11p ps=4.14e+06u
-M1017 VPWR SCE a_27_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.76e+11p ps=1.83e+06u
-M1018 a_208_464# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1019 VPWR SCD a_418_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_1198_55# a_1131_457# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Q a_2395_112# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1022 VGND SET_B a_1988_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Q a_2395_112# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1024 VPWR SET_B a_1198_55# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1025 VGND SCE a_27_464# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1026 VPWR a_1958_48# a_1721_374# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=3.655e+11p ps=4.42e+06u
-M1027 VPWR a_1764_74# a_2395_112# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.268e+11p ps=2.22e+06u
-M1028 a_292_464# D a_208_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR CLK a_599_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1030 a_1198_55# a_998_81# VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1764_74# SET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1426_118# a_998_81# a_1198_55# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1033 a_800_74# a_599_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.908e+11p pd=2.8e+06u as=0p ps=0u
-M1034 a_292_464# D a_238_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR a_1764_74# a_1958_48# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1036 VGND a_1764_74# a_2395_112# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=3.85e+11p ps=2.5e+06u
-M1037 a_1910_74# a_599_74# a_1764_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1764_74# a_800_74# a_1721_374# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_1958_48# a_1764_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
+X0 VPWR a_599_74# a_800_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_998_81# a_599_74# a_1131_457# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X2 VPWR a_998_81# a_1613_341# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 VPWR SCE a_208_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X4 a_2395_112# a_1764_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 a_599_74# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VGND a_2395_112# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_292_464# a_27_464# a_418_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X8 VPWR SET_B a_1764_74# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X9 a_1686_74# a_800_74# a_1764_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_208_464# D a_292_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X11 a_238_74# D a_292_464# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X12 a_1198_55# SET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X13 a_1721_374# a_800_74# a_1764_74# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X14 a_292_464# a_800_74# a_998_81# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X15 a_998_81# a_800_74# a_1150_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X16 VGND a_998_81# a_1686_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 VPWR a_2395_112# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 a_418_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X19 VPWR a_998_81# a_1198_55# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X20 a_1910_74# a_1958_48# a_1988_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X21 a_1426_118# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X22 a_1988_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X23 a_402_74# SCD VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X24 a_1958_48# a_1764_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X25 a_27_464# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X26 a_292_464# SCE a_402_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 a_599_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 a_292_464# a_599_74# a_998_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X29 VGND a_27_464# a_238_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X30 a_1150_81# a_1198_55# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X31 a_1721_374# a_1958_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X32 VGND a_1764_74# a_1958_48# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X33 a_1131_457# a_1198_55# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X34 a_1764_74# a_599_74# a_1910_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X35 a_1764_74# a_599_74# a_1613_341# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X36 a_1198_55# a_998_81# a_1426_118# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X37 VGND a_599_74# a_800_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X38 a_2395_112# a_1764_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X39 a_27_464# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.cdl b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.cdl
index 8ce9874..3af936e 100644
--- a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.cdl
+++ b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.cdl
@@ -16,84 +16,84 @@
 
 .SUBCKT sky130_fd_sc_ms__sdfstp_2 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI645 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI645 sceb SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net201 S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI658 M1 M0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net201 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net100 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net108 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net120 M0 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net157 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net164 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net152 M0 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI47 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net197 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI663 net201 S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net201 S0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net209 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI660 Q net201 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net201 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI659 M1 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net100 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net108 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI669 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net120 M0 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 S0 clkpos VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net157 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 S1 S0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M1 M0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net164 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 net152 M0 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net197 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net201 S0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net209 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net201 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
 .ENDS sky130_fd_sc_ms__sdfstp_2
diff --git a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.netlist.tsv b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.netlist.tsv
index 6d81f7f..c5bcded 100644
--- a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.netlist.tsv
+++ b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ms__sdfstp_2	CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI645	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net201	S0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net201	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net100	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net100	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net108	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net108	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net120	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net120	M0	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net152	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net157	S1	net209	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net164	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net197	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net164	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net152	M0	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net157	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net197	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net201	S0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net209	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net201	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI98	MOSFET	db	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI645	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net201	S0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net201	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net100	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net100	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net108	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkpos	net108	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net120	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net120	M0	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net152	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net157	S1	net209	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net164	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net197	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net164	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net152	M0	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net157	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net197	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net201	S0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net209	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net201	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
diff --git a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.spice b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.spice
index a08cc37..8dd6ae6 100644
--- a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.spice
+++ b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.spice
@@ -16,96 +16,50 @@
 
 
 .subckt sky130_fd_sc_ms__sdfstp_2 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
-M1000 a_1587_379# a_991_81# VPWR VPB pshort w=840000u l=180000u
-+  ad=4.536e+11p pd=4.44e+06u as=2.366e+12p ps=2.199e+07u
-M1001 a_1804_424# a_795_74# a_1641_74# VNB nlowvt w=640000u l=150000u
-+  ad=4.292e+11p pd=3.97e+06u as=3.584e+11p ps=3.68e+06u
-M1002 VPWR a_1804_424# a_2611_98# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1003 a_1587_379# a_608_74# a_1804_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=7.287e+11p ps=6.51e+06u
-M1004 VPWR a_2611_98# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.024e+11p ps=2.78e+06u
-M1005 a_419_464# a_27_74# a_293_464# VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=4.056e+11p ps=3.58e+06u
-M1006 a_795_74# a_608_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=2.0955e+12p ps=1.834e+07u
-M1007 VPWR a_991_81# a_1587_379# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_2186_367# a_2144_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1009 VPWR a_1804_424# a_2186_367# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1010 a_1804_424# a_608_74# a_1587_379# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1185_55# a_991_81# VPWR VPB pshort w=420000u l=180000u
-+  ad=1.323e+11p pd=1.47e+06u as=0p ps=0u
-M1012 VGND CLK a_608_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1013 a_1804_424# SET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Q a_2611_98# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1015 VPWR SCE a_27_74# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1016 a_209_464# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1017 VPWR SCD a_419_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1120_483# a_608_74# a_991_81# VPB pshort w=420000u l=180000u
-+  ad=1.588e+11p pd=1.72e+06u as=1.7185e+11p ps=1.81e+06u
-M1019 a_2144_508# a_795_74# a_1804_424# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_1185_55# a_1143_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1021 VPWR SET_B a_1185_55# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_1804_424# a_2611_98# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1023 a_293_464# D a_209_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_991_81# a_608_74# a_293_464# VNB nlowvt w=420000u l=150000u
-+  ad=2.562e+11p pd=2.06e+06u as=2.352e+11p ps=2.8e+06u
-M1025 VGND SET_B a_2219_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=1.68e+06u
-M1026 a_1429_74# a_991_81# a_1185_55# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1027 VGND SET_B a_1429_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_293_464# D a_239_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1029 a_1641_74# a_991_81# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_2186_367# a_1804_424# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1031 a_1143_81# a_795_74# a_991_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR CLK a_608_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.024e+11p ps=2.78e+06u
-M1033 VGND a_991_81# a_1641_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_991_81# a_795_74# a_293_464# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND SCD a_403_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1036 a_1641_74# a_795_74# a_1804_424# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND a_2611_98# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_239_74# a_27_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_403_74# SCE a_293_464# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_795_74# a_608_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.908e+11p pd=2.8e+06u as=0p ps=0u
-M1041 a_2219_74# a_2186_367# a_2141_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1042 VPWR a_1185_55# a_1120_483# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND SCE a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1044 a_2141_74# a_608_74# a_1804_424# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 Q a_2611_98# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1804_424# a_795_74# a_2144_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X1 a_293_464# a_27_74# a_419_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X2 VGND a_2611_98# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 a_209_464# D a_293_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X4 a_608_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_239_74# D a_293_464# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X6 a_1804_424# a_608_74# a_2141_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 a_419_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X8 VGND a_608_74# a_795_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR a_2611_98# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 a_1185_55# SET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X11 a_1587_379# a_608_74# a_1804_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X12 a_27_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X13 VPWR SET_B a_1804_424# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X14 a_1641_74# a_795_74# a_1804_424# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 a_2219_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X16 a_293_464# SCE a_403_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X17 a_608_74# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X18 a_1641_74# a_991_81# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X19 a_293_464# a_608_74# a_991_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X20 a_2141_74# a_2186_367# a_2219_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X21 VGND a_27_74# a_239_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X22 a_1587_379# a_991_81# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X23 a_2186_367# a_1804_424# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X24 a_2611_98# a_1804_424# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X25 a_293_464# a_795_74# a_991_81# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X26 a_403_74# SCD VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 a_1804_424# a_795_74# a_1641_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X28 VPWR a_608_74# a_795_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X29 a_1804_424# a_608_74# a_1587_379# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X30 Q a_2611_98# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X31 a_1429_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X32 a_2144_508# a_2186_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X33 VGND a_991_81# a_1641_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X34 VPWR a_991_81# a_1185_55# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X35 a_1185_55# a_991_81# a_1429_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X36 a_1120_483# a_1185_55# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X37 VGND a_1804_424# a_2186_367# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X38 a_991_81# a_608_74# a_1120_483# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X39 a_991_81# a_795_74# a_1143_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X40 a_27_74# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X41 VPWR a_991_81# a_1587_379# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X42 a_2611_98# a_1804_424# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X43 VPWR SCE a_209_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X44 a_1143_81# a_1185_55# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X45 Q a_2611_98# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.cdl b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.cdl
index 105a5b7..e576252 100644
--- a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.cdl
+++ b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.cdl
@@ -16,84 +16,84 @@
 
 .SUBCKT sky130_fd_sc_ms__sdfstp_4 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI645 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI645 sceb SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net201 S0 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI658 M1 M0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net201 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net100 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net108 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net120 M0 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net157 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net164 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net177 M0 VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI47 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net168 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI663 net201 S0 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net201 S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net209 SET_B VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI660 Q net201 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net201 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI659 M1 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net100 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net108 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI669 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net120 M0 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 S0 clkpos VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net157 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 S1 S0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M1 M0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net164 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 net177 M0 VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net168 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net201 S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net209 SET_B VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net201 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
 .ENDS sky130_fd_sc_ms__sdfstp_4
diff --git a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.netlist.tsv b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.netlist.tsv
index 8701968..55b9573 100644
--- a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.netlist.tsv
+++ b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ms__sdfstp_4	CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI645	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net201	S0	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net201	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net100	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net100	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net108	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net108	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net120	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net120	M0	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net177	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net157	S1	net209	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net164	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net168	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net164	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net177	M0	VGND	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net157	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net168	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net201	S0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net209	SET_B	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net201	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI98	MOSFET	db	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI645	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net201	S0	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net201	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net100	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net100	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net108	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkpos	net108	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net120	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net120	M0	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net177	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net157	S1	net209	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net164	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net168	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net164	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net177	M0	VGND	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net157	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net168	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net201	S0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net209	SET_B	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net201	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
diff --git a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.spice b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.spice
index 52e1c56..2f86adc 100644
--- a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.spice
+++ b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.spice
@@ -16,106 +16,55 @@
 
 
 .subckt sky130_fd_sc_ms__sdfstp_4 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
-M1000 Q a_2580_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=2.9103e+12p ps=2.649e+07u
-M1001 Q a_2580_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=5.291e+11p pd=4.39e+06u as=2.27325e+12p ps=1.996e+07u
-M1002 a_1017_81# a_616_74# a_291_464# VNB nlowvt w=420000u l=150000u
-+  ad=2.226e+11p pd=1.9e+06u as=3.592e+11p ps=3.44e+06u
-M1003 VGND SET_B a_1445_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1004 a_2227_74# a_2191_180# a_2149_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=1.008e+11p ps=1.32e+06u
-M1005 VGND a_1823_524# a_2580_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1006 a_1823_524# a_803_74# a_1677_74# VNB nlowvt w=640000u l=150000u
-+  ad=3.963e+11p pd=3.85e+06u as=3.584e+11p ps=3.68e+06u
-M1007 VPWR a_2191_180# a_2106_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.869e+11p ps=1.73e+06u
-M1008 a_1017_81# a_803_74# a_291_464# VPB pshort w=420000u l=180000u
-+  ad=1.8235e+11p pd=1.93e+06u as=4.056e+11p ps=3.58e+06u
-M1009 a_2580_74# a_1823_524# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1010 VPWR a_1201_55# a_1143_495# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.6975e+11p ps=1.87e+06u
-M1011 a_1823_524# SET_B VPWR VPB pshort w=420000u l=180000u
-+  ad=5.793e+11p pd=5.97e+06u as=0p ps=0u
-M1012 VGND a_1017_81# a_1677_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1143_495# a_616_74# a_1017_81# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_1823_524# a_2580_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Q a_2580_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_417_74# SCE a_291_464# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1017 VGND SCD a_417_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_1201_55# a_1153_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1019 a_1153_81# a_803_74# a_1017_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_803_74# a_616_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1021 VGND a_2580_74# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1445_74# a_1017_81# a_1201_55# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1023 VPWR SET_B a_1201_55# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1024 a_1623_373# a_1017_81# VPWR VPB pshort w=840000u l=180000u
-+  ad=4.536e+11p pd=4.44e+06u as=0p ps=0u
-M1025 VGND CLK a_616_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1026 a_2149_74# a_616_74# a_1823_524# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_417_464# a_27_74# a_291_464# VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1028 a_1201_55# a_1017_81# VPWR VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_1017_81# a_1623_373# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_2580_74# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_2580_74# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_2106_508# a_803_74# a_1823_524# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR SCE a_27_74# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1034 a_207_464# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1035 VPWR SCD a_417_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1677_74# a_803_74# a_1823_524# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR a_1823_524# a_2191_180# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1038 VGND SET_B a_2227_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_2191_180# a_1823_524# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1040 a_222_74# a_27_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1041 a_291_464# D a_222_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR CLK a_616_74# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1043 a_1623_373# a_616_74# a_1823_524# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_291_464# D a_207_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VGND SCE a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1046 Q a_2580_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_1823_524# a_616_74# a_1623_373# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_803_74# a_616_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.088e+11p pd=2.9e+06u as=0p ps=0u
-M1049 a_1677_74# a_1017_81# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 VPWR a_2580_74# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1201_55# SET_B VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X1 a_1823_524# a_616_74# a_1623_373# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 a_222_74# D a_291_464# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 VPWR a_1017_81# a_1201_55# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X4 a_1823_524# a_803_74# a_2106_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X5 VGND a_27_74# a_222_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X6 VPWR a_1823_524# a_2580_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 VGND a_2580_74# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_1823_524# a_616_74# a_2149_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 a_2227_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 VGND a_2580_74# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 VGND a_1017_81# a_1677_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 VPWR SET_B a_1823_524# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X13 a_1823_524# a_803_74# a_1677_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 a_2191_180# a_1823_524# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X15 Q a_2580_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 VPWR a_616_74# a_803_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VPWR SCE a_207_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X18 a_2580_74# a_1823_524# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_1445_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X20 Q a_2580_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 a_1677_74# a_1017_81# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X22 Q a_2580_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_291_464# a_27_74# a_417_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X24 a_207_464# D a_291_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X25 a_1623_373# a_1017_81# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X26 VGND a_616_74# a_803_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 a_1623_373# a_616_74# a_1823_524# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X28 VGND a_1823_524# a_2191_180# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X29 a_417_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X30 a_1677_74# a_803_74# a_1823_524# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X31 a_2106_508# a_2191_180# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X32 a_2580_74# a_1823_524# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X33 a_27_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X34 a_616_74# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X35 a_1201_55# a_1017_81# a_1445_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X36 a_616_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X37 a_2149_74# a_2191_180# a_2227_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X38 a_291_464# a_616_74# a_1017_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X39 a_1017_81# a_616_74# a_1143_495# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X40 a_417_74# SCD VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X41 a_1153_81# a_1201_55# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X42 VPWR a_2580_74# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X43 Q a_2580_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X44 a_1143_495# a_1201_55# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X45 VPWR a_1017_81# a_1623_373# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X46 a_27_74# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X47 a_291_464# SCE a_417_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X48 a_1017_81# a_803_74# a_1153_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X49 VPWR a_2580_74# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X50 a_291_464# a_803_74# a_1017_81# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
 .ends
diff --git a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.cdl b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.cdl
index 695db7a..d794efa 100644
--- a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.cdl
+++ b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.cdl
@@ -16,76 +16,76 @@
 
 .SUBCKT sky130_fd_sc_ms__sdfxbp_1 CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI98 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI657 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net80 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net92 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N net205 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net205 S1 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI657 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI656 net80 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI641 net92 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N net205 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net205 S1 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 S1 S0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI94 db D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI101 db sceb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net196 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI637 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q_N net205 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net160 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI658 net196 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI640 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 net205 S1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q_N net205 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net160 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 net205 S1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__sdfxbp_1
diff --git a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.netlist.tsv b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.netlist.tsv
index c33989e..e2ddb68 100644
--- a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.netlist.tsv
+++ b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_ms__sdfxbp_1	CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI98	MOSFET	db	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI657	MOSFET	M0	clkpos	net80	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net80	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net92	S1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net92	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net205	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net205	S1	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net160	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net196	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	net205	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net160	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net196	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	net205	S1	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI657	MOSFET	M0	clkpos	net80	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net80	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net92	S1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net92	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net205	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net205	S1	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net160	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net196	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q_N	net205	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net160	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net196	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	net205	S1	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.spice b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.spice
index 77f331c..bbb6b8c 100644
--- a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.spice
+++ b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_ms__sdfxbp_1 CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 a_1529_74# a_612_74# a_1243_398# VPB pshort w=840000u l=180000u
-+  ad=2.667e+11p pd=2.39e+06u as=6.216e+11p ps=3.16e+06u
-M1001 a_1723_48# a_1529_74# VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=1.8401e+12p ps=1.538e+07u
-M1002 VPWR a_1723_48# a_1694_508# VPB pshort w=420000u l=180000u
-+  ad=2.5456e+12p pd=2.012e+07u as=1.008e+11p ps=1.32e+06u
-M1003 a_434_74# SCE a_296_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.423e+11p ps=3.31e+06u
-M1004 VPWR a_1723_48# a_2216_112# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.184e+11p ps=2.2e+06u
-M1005 Q a_1723_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1006 a_1157_100# a_828_74# a_1021_100# VNB nlowvt w=420000u l=150000u
-+  ad=1.932e+11p pd=1.76e+06u as=2.226e+11p ps=1.9e+06u
-M1007 a_218_74# a_31_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1008 a_296_74# D a_218_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR SCD a_410_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=2.304e+11p ps=2e+06u
-M1010 a_1529_74# a_828_74# a_1243_398# VNB nlowvt w=550000u l=150000u
-+  ad=2.887e+11p pd=2.32e+06u as=1.5675e+11p ps=1.67e+06u
-M1011 a_1243_398# a_1021_100# VGND VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Q a_1723_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1013 a_612_74# CLK VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1014 a_1723_48# a_1529_74# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
-M1015 a_828_74# a_612_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.998e+11p pd=2.02e+06u as=0p ps=0u
-M1016 VGND a_1243_398# a_1157_100# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1681_74# a_612_74# a_1529_74# VNB nlowvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1018 a_236_464# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1019 a_1243_398# a_1021_100# VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1694_508# a_828_74# a_1529_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_1723_48# a_1681_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR SCE a_31_74# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1023 a_612_74# CLK VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1024 VGND SCE a_31_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1025 a_828_74# a_612_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.968e+11p pd=2.77e+06u as=0p ps=0u
-M1026 Q_N a_2216_112# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1027 VGND SCD a_434_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_296_74# D a_236_464# VPB pshort w=640000u l=180000u
-+  ad=2.841e+11p pd=3.19e+06u as=0p ps=0u
-M1029 a_1021_100# a_828_74# a_296_74# VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1030 a_1021_100# a_612_74# a_296_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_1243_398# a_1183_496# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1032 a_410_464# a_31_74# a_296_74# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1183_496# a_612_74# a_1021_100# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Q_N a_2216_112# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1035 VGND a_1723_48# a_2216_112# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
+X0 a_1183_496# a_1243_398# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X1 VPWR a_1723_48# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 VPWR SCE a_236_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X3 a_1021_100# a_612_74# a_1183_496# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X4 VPWR a_2216_112# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VGND CLK a_612_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VGND a_1021_100# a_1243_398# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X7 VGND a_1723_48# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_296_74# a_31_74# a_410_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X9 a_218_74# D a_296_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 a_2216_112# a_1723_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X11 a_1694_508# a_1723_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X12 VGND a_31_74# a_218_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X13 a_434_74# SCD VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X14 a_1681_74# a_1723_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X15 VPWR a_612_74# a_828_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_31_74# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X17 a_410_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X18 a_296_74# a_828_74# a_1021_100# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X19 a_1243_398# a_612_74# a_1529_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X20 VPWR a_1529_74# a_1723_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X21 a_1529_74# a_828_74# a_1694_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X22 a_1243_398# a_828_74# a_1529_74# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X23 a_236_464# D a_296_74# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X24 VPWR a_1021_100# a_1243_398# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X25 VPWR CLK a_612_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 a_296_74# SCE a_434_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 a_1157_100# a_1243_398# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X28 a_31_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X29 a_2216_112# a_1723_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X30 a_296_74# a_612_74# a_1021_100# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X31 VGND a_1529_74# a_1723_48# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X32 a_1021_100# a_828_74# a_1157_100# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X33 VGND a_2216_112# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 VGND a_612_74# a_828_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X35 a_1529_74# a_612_74# a_1681_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.cdl b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.cdl
index cb49c82..dd9b11e 100644
--- a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.cdl
+++ b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.cdl
@@ -16,76 +16,76 @@
 
 .SUBCKT sky130_fd_sc_ms__sdfxbp_2 CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI98 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI657 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net85 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net92 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N net205 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net205 S1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI657 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI656 net85 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI641 net92 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N net205 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net205 S1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 S1 S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI94 db D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI101 db sceb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net196 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI637 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q_N net205 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net181 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI658 net196 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI640 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 net205 S1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q_N net205 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net181 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 net205 S1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__sdfxbp_2
diff --git a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.netlist.tsv b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.netlist.tsv
index e2e5f40..9c6688f 100644
--- a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.netlist.tsv
+++ b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_ms__sdfxbp_2	CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI98	MOSFET	db	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI657	MOSFET	M0	clkpos	net85	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net85	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net92	S1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net92	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net205	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net205	S1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net181	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net196	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	net205	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net181	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net196	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	net205	S1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI657	MOSFET	M0	clkpos	net85	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net85	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net92	S1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net92	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net205	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net205	S1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net181	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net196	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q_N	net205	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net181	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net196	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	net205	S1	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.spice b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.spice
index 68893ea..50e234c 100644
--- a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.spice
+++ b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ms__sdfxbp_2 CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 VGND a_1711_48# Q VNB nlowvt w=740000u l=150000u
-+  ad=2.2043e+12p pd=1.954e+07u as=2.072e+11p ps=2.04e+06u
-M1001 a_1511_74# a_630_74# a_1243_48# VPB pshort w=840000u l=180000u
-+  ad=2.667e+11p pd=2.39e+06u as=5.166e+11p ps=2.91e+06u
-M1002 VGND a_2322_368# Q_N VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.183e+11p ps=2.07e+06u
-M1003 VPWR a_1711_48# a_1694_508# VPB pshort w=420000u l=180000u
-+  ad=3.0047e+12p pd=2.544e+07u as=1.008e+11p ps=1.32e+06u
-M1004 VPWR SCE a_36_74# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=2.336e+11p ps=2.01e+06u
-M1005 a_630_74# CLK VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1006 a_241_453# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1007 a_630_74# CLK VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=5.488e+11p pd=3.22e+06u as=0p ps=0u
-M1008 a_1220_499# a_630_74# a_1021_97# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.491e+11p ps=1.55e+06u
-M1009 Q a_1711_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1010 VPWR a_1711_48# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_1243_48# a_1220_499# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1663_74# a_630_74# a_1511_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.887e+11p ps=2.32e+06u
-M1013 VGND a_1711_48# a_1663_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1711_48# a_1511_74# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1015 a_828_74# a_630_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.998e+11p pd=2.02e+06u as=0p ps=0u
-M1016 a_301_74# D a_241_453# VPB pshort w=640000u l=180000u
-+  ad=3.256e+11p pd=3.33e+06u as=0p ps=0u
-M1017 a_223_74# a_36_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1018 a_301_74# D a_223_74# VNB nlowvt w=420000u l=150000u
-+  ad=3.654e+11p pd=3.42e+06u as=0p ps=0u
-M1019 a_1243_48# a_1021_97# VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_1243_48# a_1173_97# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.6425e+11p ps=1.77e+06u
-M1021 a_426_453# a_36_74# a_301_74# VPB pshort w=640000u l=180000u
-+  ad=1.952e+11p pd=1.89e+06u as=0p ps=0u
-M1022 a_1694_508# a_828_74# a_1511_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1021_97# a_828_74# a_301_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1021_97# a_630_74# a_301_74# VNB nlowvt w=420000u l=150000u
-+  ad=2.562e+11p pd=2.06e+06u as=0p ps=0u
-M1025 a_1243_48# a_1021_97# VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=0p ps=0u
-M1026 Q_N a_2322_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_1711_48# a_2322_368# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1028 a_828_74# a_630_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1029 Q a_1711_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_1711_48# a_2322_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1031 VGND SCD a_450_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1032 a_1711_48# a_1511_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1033 a_450_74# SCE a_301_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Q_N a_2322_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1035 a_1173_97# a_828_74# a_1021_97# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR a_2322_368# Q_N VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR SCD a_426_453# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND SCE a_36_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1039 a_1511_74# a_828_74# a_1243_48# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_301_74# a_36_74# a_426_453# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X1 a_36_74# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 a_301_74# a_630_74# a_1021_97# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 a_1694_508# a_1711_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X4 VPWR a_1711_48# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 VPWR a_630_74# a_828_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_426_453# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X7 a_301_74# a_828_74# a_1021_97# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X8 a_301_74# SCE a_450_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 a_36_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X10 VGND a_1021_97# a_1243_48# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X11 a_2322_368# a_1711_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 Q_N a_2322_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VPWR a_2322_368# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_241_453# D a_301_74# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X15 a_1243_48# a_630_74# a_1511_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X16 VGND a_2322_368# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 VPWR a_1511_74# a_1711_48# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X18 a_1663_74# a_1711_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X19 a_1511_74# a_828_74# a_1694_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X20 a_1021_97# a_828_74# a_1173_97# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X21 a_2322_368# a_1711_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X22 a_1173_97# a_1243_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X23 a_1243_48# a_828_74# a_1511_74# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X24 a_450_74# SCD VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X25 VPWR a_1021_97# a_1243_48# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X26 a_1511_74# a_630_74# a_1663_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 VGND a_1711_48# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 VPWR CLK a_630_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X29 a_1021_97# a_630_74# a_1220_499# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X30 VGND CLK a_630_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X31 Q a_1711_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 VPWR SCE a_241_453# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X33 a_1220_499# a_1243_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X34 a_223_74# D a_301_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X35 VGND a_1511_74# a_1711_48# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X36 VGND a_36_74# a_223_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X37 VGND a_630_74# a_828_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X38 Q_N a_2322_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X39 Q a_1711_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.cdl b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.cdl
index 6c4aa1f..23c1939 100644
--- a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.cdl
+++ b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ms__sdfxtp_1 CLK D SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI652 M1 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI652 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net74 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net98 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 net158 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI640 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net142 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI649 S1 S0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI634 M1 M0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net74 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net98 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 net158 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net142 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI651 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI94 db D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI101 db sceb VPB pfet_01v8 m=1 w=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_ms__sdfxtp_1
diff --git a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.netlist.tsv b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.netlist.tsv
index 1756408..4826eb1 100644
--- a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.netlist.tsv
+++ b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ms__sdfxtp_1	CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI652	MOSFET	M1	clkpos	S0	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net74	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net74	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net98	S1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net98	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI98	MOSFET	db	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	net158	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net142	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net142	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net158	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net74	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net74	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net98	S1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net98	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	net158	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net142	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net142	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net158	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.spice b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.spice
index 49fe6e8..87cd0d5 100644
--- a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.spice
+++ b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ms__sdfxtp_1 CLK D SCD SCE VGND VNB VPB VPWR Q
-M1000 a_1520_74# a_828_74# a_1239_74# VNB nlowvt w=550000u l=150000u
-+  ad=3.223e+11p pd=2.48e+06u as=1.5675e+11p ps=1.67e+06u
-M1001 Q a_1736_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.08e+11p pd=2.79e+06u as=2.1858e+12p ps=1.697e+07u
-M1002 VPWR SCD a_415_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=2.304e+11p ps=2e+06u
-M1003 a_630_74# CLK VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.52935e+12p ps=1.307e+07u
-M1004 a_630_74# CLK VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1005 VGND a_1736_74# a_1688_100# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1006 VGND SCE a_35_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1007 a_1018_100# a_630_74# a_301_74# VNB nlowvt w=420000u l=150000u
-+  ad=2.226e+11p pd=1.9e+06u as=3.612e+11p ps=3.4e+06u
-M1008 a_828_74# a_630_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1009 a_1736_74# a_1520_74# VGND VNB nlowvt w=550000u l=150000u
-+  ad=1.4575e+11p pd=1.63e+06u as=0p ps=0u
-M1010 a_1691_508# a_828_74# a_1520_74# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.738e+11p ps=2.73e+06u
-M1011 a_1239_74# a_1018_100# VGND VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_241_464# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1013 a_1205_508# a_630_74# a_1018_100# VPB pshort w=420000u l=180000u
-+  ad=9.24e+10p pd=1.28e+06u as=1.344e+11p ps=1.48e+06u
-M1014 VPWR SCE a_35_74# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1015 a_1018_100# a_828_74# a_301_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=2.904e+11p ps=3.22e+06u
-M1016 a_1239_74# a_1018_100# VPWR VPB pshort w=840000u l=180000u
-+  ad=4.41e+11p pd=2.73e+06u as=0p ps=0u
-M1017 Q a_1736_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.035e+11p pd=2.03e+06u as=0p ps=0u
-M1018 a_828_74# a_630_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1019 VPWR a_1239_74# a_1205_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_223_74# a_35_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1021 a_301_74# D a_223_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_1736_74# a_1691_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1688_100# a_630_74# a_1520_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_1239_74# a_1154_100# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.785e+11p ps=1.69e+06u
-M1025 a_301_74# D a_241_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1520_74# a_630_74# a_1239_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_415_464# a_35_74# a_301_74# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND SCD a_450_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1029 a_450_74# SCE a_301_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1154_100# a_828_74# a_1018_100# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1736_74# a_1520_74# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
+X0 a_1018_100# a_630_74# a_1205_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X1 VPWR SCE a_241_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X2 VPWR a_1018_100# a_1239_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 a_1520_74# a_828_74# a_1691_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X4 a_301_74# a_35_74# a_415_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X5 VPWR a_630_74# a_828_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_35_74# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 a_1691_508# a_1736_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X8 a_1239_74# a_630_74# a_1520_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 a_301_74# SCE a_450_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 a_1520_74# a_630_74# a_1688_100# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X11 VGND a_1736_74# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 a_301_74# a_630_74# a_1018_100# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X13 VPWR a_1736_74# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_415_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X15 VGND a_1520_74# a_1736_74# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X16 a_450_74# SCD VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X17 a_241_464# D a_301_74# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X18 VPWR CLK a_630_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 VGND CLK a_630_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 a_1018_100# a_828_74# a_1154_100# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X21 a_1239_74# a_828_74# a_1520_74# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X22 a_301_74# a_828_74# a_1018_100# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X23 a_35_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X24 a_1205_508# a_1239_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X25 a_223_74# D a_301_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X26 VPWR a_1520_74# a_1736_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X27 VGND a_35_74# a_223_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X28 VGND a_630_74# a_828_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 VGND a_1018_100# a_1239_74# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X30 a_1154_100# a_1239_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X31 a_1688_100# a_1736_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.cdl b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.cdl
index 387b43d..0019aff 100644
--- a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.cdl
+++ b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ms__sdfxtp_2 CLK D SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI652 M1 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI652 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net74 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net83 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 net158 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI640 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net142 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI649 S1 S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI634 M1 M0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net74 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net83 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 net158 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net142 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI651 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI94 db D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI101 db sceb VPB pfet_01v8 m=1 w=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_ms__sdfxtp_2
diff --git a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.netlist.tsv b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.netlist.tsv
index 8541e6b..776a0ce 100644
--- a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.netlist.tsv
+++ b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ms__sdfxtp_2	CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI652	MOSFET	M1	clkpos	S0	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net74	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net74	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net83	S1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net83	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI98	MOSFET	db	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	net158	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net142	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net142	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net158	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net74	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net74	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net83	S1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net83	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	net158	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net142	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net142	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net158	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.spice b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.spice
index 2c596de..807ac9a 100644
--- a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.spice
+++ b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ms__sdfxtp_2 CLK D SCD SCE VGND VNB VPB VPWR Q
-M1000 a_1707_496# a_846_74# a_1595_424# VPB pshort w=420000u l=180000u
-+  ad=2.562e+11p pd=2.06e+06u as=2.754e+11p ps=2.44e+06u
-M1001 a_1044_100# a_634_74# a_301_74# VNB nlowvt w=420000u l=150000u
-+  ad=3.045e+11p pd=2.29e+06u as=3.528e+11p ps=3.36e+06u
-M1002 VPWR SCE a_27_74# VPB pshort w=640000u l=180000u
-+  ad=2.72693e+12p pd=2.061e+07u as=1.792e+11p ps=1.84e+06u
-M1003 a_1595_424# a_634_74# a_1287_320# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=4.2e+11p ps=2.68e+06u
-M1004 VGND SCD a_442_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.84785e+12p pd=1.542e+07u as=1.008e+11p ps=1.32e+06u
-M1005 VGND a_1829_398# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.405e+11p ps=2.13e+06u
-M1006 a_301_74# D a_219_453# VPB pshort w=640000u l=180000u
-+  ad=4.472e+11p pd=3.71e+06u as=1.536e+11p ps=1.76e+06u
-M1007 a_1219_100# a_846_74# a_1044_100# VNB nlowvt w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=0p ps=0u
-M1008 a_1287_320# a_1044_100# VGND VNB nlowvt w=550000u l=150000u
-+  ad=3.795e+11p pd=2.48e+06u as=0p ps=0u
-M1009 a_1829_398# a_1595_424# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1010 VGND a_1287_320# a_1219_100# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1595_424# a_846_74# a_1287_320# VNB nlowvt w=550000u l=150000u
-+  ad=1.8825e+11p pd=1.82e+06u as=0p ps=0u
-M1012 a_634_74# CLK VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1013 a_442_74# SCE a_301_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_1829_398# a_1707_496# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_223_74# a_27_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1016 a_301_74# D a_223_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1829_398# a_1595_424# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1018 VPWR SCD a_442_453# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1019 a_846_74# a_634_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1020 VPWR a_1287_320# a_1213_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.554e+11p ps=1.58e+06u
-M1021 a_1787_74# a_634_74# a_1595_424# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1022 VGND a_1829_398# a_1787_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1044_100# a_846_74# a_301_74# VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1024 Q a_1829_398# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1213_508# a_634_74# a_1044_100# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Q a_1829_398# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1027 a_1287_320# a_1044_100# VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_1829_398# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_442_453# a_27_74# a_301_74# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_846_74# a_634_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1031 a_634_74# CLK VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1032 a_219_453# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND SCE a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
+X0 a_301_74# SCE a_442_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X1 Q a_1829_398# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_1287_320# a_634_74# a_1595_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 a_1044_100# a_634_74# a_1213_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X4 a_301_74# a_27_74# a_442_453# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X5 a_27_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X6 a_27_74# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 a_1595_424# a_846_74# a_1707_496# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X8 VGND CLK a_634_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 Q a_1829_398# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_442_453# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X11 VPWR SCE a_219_453# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X12 VPWR a_1829_398# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_1287_320# a_846_74# a_1595_424# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X14 a_219_453# D a_301_74# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X15 a_301_74# a_846_74# a_1044_100# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X16 VGND a_634_74# a_846_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_1219_100# a_1287_320# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X18 VPWR CLK a_634_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_1044_100# a_846_74# a_1219_100# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X20 a_442_74# SCD VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X21 VGND a_1595_424# a_1829_398# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 VPWR a_1595_424# a_1829_398# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X23 a_301_74# a_634_74# a_1044_100# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X24 a_1707_496# a_1829_398# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X25 VGND a_1044_100# a_1287_320# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X26 VGND a_1829_398# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 a_223_74# D a_301_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X28 a_1787_74# a_1829_398# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X29 a_1213_508# a_1287_320# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X30 VPWR a_1044_100# a_1287_320# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X31 VGND a_27_74# a_223_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X32 VPWR a_634_74# a_846_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X33 a_1595_424# a_634_74# a_1787_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.cdl b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.cdl
index 6a14f5e..d8c7536 100644
--- a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.cdl
+++ b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ms__sdfxtp_4 CLK D SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI652 M1 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI652 M1 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net74 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net83 S1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 net158 S1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI640 sceb SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net127 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI649 S1 S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI634 M1 M0 VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 sceb SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net74 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net83 S1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S1 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 net158 S1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net127 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI651 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI107 p0 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI94 db D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI101 db sceb VPB pfet_01v8 m=1 w=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_ms__sdfxtp_4
diff --git a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.netlist.tsv b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.netlist.tsv
index 86a4fd1..f2b3bb5 100644
--- a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.netlist.tsv
+++ b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ms__sdfxtp_4	CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI652	MOSFET	M1	clkpos	S0	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	sceb	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net74	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net74	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net83	S1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net83	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI98	MOSFET	db	D	n0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	net158	S1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net127	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net127	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net158	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net74	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net74	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net83	S1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net83	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	net158	S1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net127	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net127	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net158	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.spice b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.spice
index 6522104..2b555b2 100644
--- a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.spice
+++ b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.spice
@@ -16,82 +16,43 @@
 
 
 .subckt sky130_fd_sc_ms__sdfxtp_4 CLK D SCD SCE VGND VNB VPB VPWR Q
-M1000 VPWR SCD a_415_464# VPB pshort w=640000u l=180000u
-+  ad=2.83978e+12p pd=2.238e+07u as=2.304e+11p ps=2e+06u
-M1001 a_630_74# CLK VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1002 a_1026_100# a_828_74# a_301_74# VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=2.904e+11p ps=3.22e+06u
-M1003 a_630_74# CLK VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.77695e+12p ps=1.604e+07u
-M1004 VGND a_1814_48# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.773e+11p ps=4.25e+06u
-M1005 Q a_1814_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1006 a_1217_506# a_630_74# a_1026_100# VPB pshort w=420000u l=180000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1007 VPWR a_1814_48# a_1767_476# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1008 VPWR a_1587_74# a_1814_48# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.268e+11p ps=2.22e+06u
-M1009 VPWR a_1257_74# a_1217_506# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND SCD a_452_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1011 a_452_74# SCE a_301_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.738e+11p ps=3.46e+06u
-M1012 a_1162_100# a_828_74# a_1026_100# VNB nlowvt w=420000u l=150000u
-+  ad=1.995e+11p pd=1.79e+06u as=2.226e+11p ps=1.9e+06u
-M1013 a_241_464# SCE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1014 VPWR a_1814_48# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR SCE a_36_74# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1016 Q a_1814_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Q a_1814_48# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_1814_48# a_1766_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1019 Q a_1814_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1766_74# a_630_74# a_1587_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=4e+11p ps=2.59e+06u
-M1021 a_828_74# a_630_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1022 a_223_74# a_36_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1023 a_301_74# D a_223_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_1814_48# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_828_74# a_630_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1026 a_301_74# D a_241_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1026_100# a_630_74# a_301_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1814_48# a_1587_74# VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_415_464# a_36_74# a_301_74# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND a_1587_74# a_1814_48# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1031 VGND a_1814_48# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1587_74# a_828_74# a_1257_74# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=2.365e+11p ps=1.96e+06u
-M1033 a_1587_74# a_630_74# a_1257_74# VPB pshort w=840000u l=180000u
-+  ad=2.709e+11p pd=2.4e+06u as=7.308e+11p ps=3.42e+06u
-M1034 VGND a_1257_74# a_1162_100# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1257_74# a_1026_100# VGND VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND SCE a_36_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1037 a_1257_74# a_1026_100# VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1767_476# a_828_74# a_1587_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_452_74# SCD VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X1 a_1587_74# a_630_74# a_1766_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 a_301_74# SCE a_452_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 a_301_74# a_630_74# a_1026_100# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 Q a_1814_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 VPWR SCE a_241_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X6 a_36_74# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 VPWR CLK a_630_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VPWR a_630_74# a_828_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_301_74# a_36_74# a_415_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X10 VPWR a_1587_74# a_1814_48# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X11 VPWR a_1814_48# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_1814_48# a_1587_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_1587_74# a_828_74# a_1767_476# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X14 Q a_1814_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 VGND a_1814_48# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_301_74# a_828_74# a_1026_100# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X17 VGND a_1026_100# a_1257_74# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X18 a_1767_476# a_1814_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X19 Q a_1814_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_1026_100# a_828_74# a_1162_100# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X21 a_1162_100# a_1257_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X22 a_1257_74# a_828_74# a_1587_74# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X23 a_415_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X24 a_1814_48# a_1587_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X25 a_1217_506# a_1257_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X26 VGND a_1814_48# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 a_241_464# D a_301_74# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X28 VGND CLK a_630_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 VPWR a_1026_100# a_1257_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X30 VPWR a_1814_48# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X31 a_36_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X32 a_223_74# D a_301_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X33 a_1257_74# a_630_74# a_1587_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X34 a_1026_100# a_630_74# a_1217_506# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X35 Q a_1814_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X36 VGND a_36_74# a_223_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X37 VGND a_630_74# a_828_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X38 a_1766_74# a_1814_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.cdl b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.cdl
index 979fffc..10edf01 100644
--- a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.cdl
+++ b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ms__sdlclkp_1 CLK GATE SCE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I SCE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net48 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net60 CLK VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net60 m1 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 m1 M0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 net68 SCE VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 net108 GATE VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI662 net48 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 GCLK net60 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net108 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI664 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net108 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI659 net60 CLK VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net99 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 net108 SCE VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net112 CLK VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net60 m1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 net108 GATE VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 net60 m1 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI19 m1 M0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 GCLK net60 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI22 net68 SCE VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI21 net108 GATE VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 GCLK net60 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net108 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net108 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net99 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 net108 SCE VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net112 CLK VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net60 m1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net108 GATE VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net60 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__sdlclkp_1
diff --git a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.netlist.tsv b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.netlist.tsv
index d780b0e..a04436b 100644
--- a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.netlist.tsv
+++ b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ms__sdlclkp_1	CLK:I GATE:I SCE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI662	MOSFET	net48	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkpos	net48	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net60	CLK	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net60	m1	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net68	SCE	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net108	GATE	net68	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net60	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net108	clkneg	M0	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net108	clkpos	M0	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkneg	net99	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net99	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net108	SCE	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net112	CLK	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net60	m1	net112	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net108	GATE	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net60	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net48	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkpos	net48	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net60	CLK	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net60	m1	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net68	SCE	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net108	GATE	net68	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	GCLK	net60	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net108	clkneg	M0	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net108	clkpos	M0	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkneg	net99	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net99	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net108	SCE	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net112	CLK	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net60	m1	net112	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net108	GATE	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net60	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.spice b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.spice
index 8234096..3ee9fb3 100644
--- a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.spice
+++ b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ms__sdlclkp_1 CLK GATE SCE VGND VNB VPB VPWR GCLK
-M1000 a_114_112# GATE a_119_424# VPB pshort w=840000u l=180000u
-+  ad=4.704e+11p pd=4.48e+06u as=1.764e+11p ps=2.1e+06u
-M1001 a_709_54# a_566_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=1.81885e+12p ps=1.43e+07u
-M1002 a_725_492# a_288_48# a_566_74# VPB pshort w=420000u l=180000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.92075e+11p ps=2.68e+06u
-M1003 a_318_74# a_288_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.3368e+12p ps=1.136e+07u
-M1004 a_1238_94# CLK VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1005 VGND CLK a_288_48# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1006 a_1166_94# CLK VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1007 a_1238_94# a_709_54# a_1166_94# VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1008 a_119_424# SCE VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_709_54# a_1238_94# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_709_54# a_566_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1011 a_566_74# a_318_74# a_114_112# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND GATE a_114_112# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=4.4825e+11p ps=3.83e+06u
-M1013 a_114_112# SCE VGND VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 GCLK a_1238_94# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=4.088e+11p pd=2.97e+06u as=0p ps=0u
-M1015 a_667_80# a_318_74# a_566_74# VNB nlowvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.846e+11p ps=1.81e+06u
-M1016 VGND a_709_54# a_667_80# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_566_74# a_288_48# a_114_112# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_709_54# a_725_492# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 GCLK a_1238_94# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1020 VPWR CLK a_288_48# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1021 a_318_74# a_288_48# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
+X0 VGND a_288_48# a_318_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VGND a_1238_94# GCLK VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_725_492# a_709_54# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X3 a_288_48# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X4 VPWR CLK a_1238_94# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 a_1166_94# a_709_54# a_1238_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 a_114_112# a_318_74# a_566_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 a_1238_94# a_709_54# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X8 a_288_48# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_114_112# a_288_48# a_566_74# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X10 VPWR a_1238_94# GCLK VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VPWR SCE a_119_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X12 VPWR a_566_74# a_709_54# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_566_74# a_318_74# a_667_80# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X14 VGND SCE a_114_112# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X15 a_119_424# GATE a_114_112# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X16 a_114_112# GATE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X17 VGND CLK a_1166_94# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X18 a_667_80# a_709_54# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X19 a_566_74# a_288_48# a_725_492# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X20 VPWR a_288_48# a_318_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X21 VGND a_566_74# a_709_54# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.cdl b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.cdl
index 06bf225..65c5994 100644
--- a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.cdl
+++ b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ms__sdlclkp_2 CLK GATE SCE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I SCE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net48 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net60 CLK VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net60 m1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 m1 M0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 net68 SCE VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 net108 GATE VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI662 net48 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 GCLK net60 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net108 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI664 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net108 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI659 net60 CLK VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI658 net60 m1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI19 m1 M0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net99 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 net108 SCE VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net112 CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net60 m1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 net108 GATE VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI22 net68 SCE VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 GCLK net60 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI21 net108 GATE VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 GCLK net60 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net108 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net108 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net99 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 net108 SCE VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net112 CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net60 m1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net108 GATE VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net60 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__sdlclkp_2
diff --git a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.netlist.tsv b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.netlist.tsv
index 8af1ebf..a1d9e57 100644
--- a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.netlist.tsv
+++ b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ms__sdlclkp_2	CLK:I GATE:I SCE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI662	MOSFET	net48	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkpos	net48	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net60	CLK	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net60	m1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net68	SCE	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net108	GATE	net68	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net60	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net108	clkneg	M0	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net108	clkpos	M0	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkneg	net99	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net99	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net108	SCE	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net112	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net60	m1	net112	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net108	GATE	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net60	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net48	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkpos	net48	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net60	CLK	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net60	m1	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net68	SCE	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net108	GATE	net68	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	GCLK	net60	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net108	clkneg	M0	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net108	clkpos	M0	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkneg	net99	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net99	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net108	SCE	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net112	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net60	m1	net112	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net108	GATE	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net60	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.spice b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.spice
index d42a4f6..a70020d 100644
--- a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.spice
+++ b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__sdlclkp_2 CLK GATE SCE VGND VNB VPB VPWR GCLK
-M1000 a_706_317# a_580_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=2.04535e+12p ps=1.691e+07u
-M1001 GCLK a_1198_374# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1002 VGND CLK a_288_48# VNB nlowvt w=740000u l=150000u
-+  ad=1.5071e+12p pd=1.328e+07u as=2.109e+11p ps=2.05e+06u
-M1003 VPWR a_1198_374# GCLK VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_706_317# a_580_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1005 a_580_74# a_318_74# a_114_112# VPB pshort w=840000u l=180000u
-+  ad=2.583e+11p pd=2.37e+06u as=4.536e+11p ps=4.44e+06u
-M1006 a_318_74# a_288_48# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1007 VPWR a_706_317# a_711_451# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1008 a_114_112# GATE a_117_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=1.764e+11p ps=2.1e+06u
-M1009 GCLK a_1198_374# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1010 VPWR CLK a_288_48# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=2.268e+11p ps=2.22e+06u
-M1011 a_1198_374# a_706_317# a_1198_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.035e+11p pd=2.03e+06u as=1.554e+11p ps=1.9e+06u
-M1012 a_318_74# a_288_48# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1013 a_711_451# a_288_48# a_580_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND GATE a_114_112# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=4.8675e+11p ps=3.97e+06u
-M1015 a_114_112# SCE VGND VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1198_74# CLK VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_1198_374# GCLK VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_685_81# a_318_74# a_580_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.9475e+11p ps=1.85e+06u
-M1019 VGND a_706_317# a_685_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_706_317# a_1198_374# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=4.85e+11p ps=2.97e+06u
-M1021 a_1198_374# CLK VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_117_424# SCE VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_580_74# a_288_48# a_114_112# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_288_48# a_318_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VPWR CLK a_1198_374# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 GCLK a_1198_374# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 GCLK a_1198_374# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_114_112# a_288_48# a_580_74# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X5 a_288_48# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X6 VGND CLK a_1198_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_580_74# a_288_48# a_711_451# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X8 a_117_424# GATE a_114_112# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 a_685_81# a_706_317# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 VGND SCE a_114_112# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X11 a_580_74# a_318_74# a_685_81# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X12 VPWR a_1198_374# GCLK VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_288_48# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VGND a_580_74# a_706_317# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_711_451# a_706_317# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X16 VPWR a_580_74# a_706_317# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 a_114_112# GATE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X18 VPWR SCE a_117_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X19 VPWR a_288_48# a_318_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X20 a_114_112# a_318_74# a_580_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X21 a_1198_374# a_706_317# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X22 VGND a_1198_374# GCLK VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_1198_74# a_706_317# a_1198_374# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.cdl b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.cdl
index f2640b0..a2764ce 100644
--- a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.cdl
+++ b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ms__sdlclkp_4 CLK GATE SCE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I SCE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net48 m1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net60 CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net60 m1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 m1 M0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 net68 SCE VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 net108 GATE VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI662 net48 m1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 GCLK net60 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net108 clkneg VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI664 M0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net108 clkpos VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI659 net60 CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 m1 M0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net99 m1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 net108 SCE VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net112 CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net60 m1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 net108 GATE VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 net60 m1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI19 m1 M0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 GCLK net60 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI22 net68 SCE VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI21 net108 GATE VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 GCLK net60 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net108 clkneg VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net108 clkpos VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 m1 M0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net99 m1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 net108 SCE VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net112 CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net60 m1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net108 GATE VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net60 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__sdlclkp_4
diff --git a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.netlist.tsv b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.netlist.tsv
index f83b539..813e2a4 100644
--- a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.netlist.tsv
+++ b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ms__sdlclkp_4	CLK:I GATE:I SCE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI662	MOSFET	net48	m1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkpos	net48	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net60	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net60	m1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net68	SCE	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net108	GATE	net68	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net60	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net108	clkneg	M0	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net108	clkpos	M0	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkneg	net99	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net99	m1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net108	SCE	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net112	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net60	m1	net112	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net108	GATE	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net60	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net48	m1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkpos	net48	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net60	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net60	m1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	m1	M0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net68	SCE	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net108	GATE	net68	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	GCLK	net60	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net108	clkneg	M0	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net108	clkpos	M0	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkneg	net99	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net99	m1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net108	SCE	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net112	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net60	m1	net112	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net108	GATE	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net60	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.spice b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.spice
index 6f6e740..3132630 100644
--- a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.spice
+++ b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__sdlclkp_4 CLK GATE SCE VGND VNB VPB VPWR GCLK
-M1000 VGND a_1292_368# GCLK VNB nlowvt w=740000u l=150000u
-+  ad=1.98545e+12p pd=1.63e+07u as=4.514e+11p ps=4.18e+06u
-M1001 a_119_143# GATE a_119_395# VPB pshort w=840000u l=180000u
-+  ad=4.704e+11p pd=4.48e+06u as=2.016e+11p ps=2.16e+06u
-M1002 VPWR CLK a_324_79# VPB pshort w=840000u l=180000u
-+  ad=2.4738e+12p pd=1.955e+07u as=2.394e+11p ps=2.25e+06u
-M1003 VGND a_1292_368# GCLK VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_354_105# a_324_79# VPWR VPB pshort w=840000u l=180000u
-+  ad=3.907e+11p pd=2.99e+06u as=0p ps=0u
-M1005 a_634_74# a_354_105# a_119_143# VPB pshort w=840000u l=180000u
-+  ad=2.667e+11p pd=2.39e+06u as=0p ps=0u
-M1006 a_792_48# a_634_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1007 VGND a_792_48# a_744_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1008 a_788_455# a_324_79# a_634_74# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1009 GCLK a_1292_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=8.008e+11p pd=5.91e+06u as=0p ps=0u
-M1010 VPWR a_1292_368# GCLK VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1292_74# CLK VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1012 a_1292_368# a_792_48# a_1292_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1013 VGND CLK a_324_79# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1014 VPWR a_792_48# a_788_455# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 GCLK a_1292_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_1292_368# GCLK VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_744_74# a_354_105# a_634_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.1025e+11p ps=1.9e+06u
-M1018 GCLK a_1292_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_792_48# a_1292_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=5.208e+11p ps=3.17e+06u
-M1020 a_1292_368# CLK VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_354_105# a_324_79# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1022 a_792_48# a_634_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1023 a_119_143# SCE VGND VNB nlowvt w=550000u l=150000u
-+  ad=5.61e+11p pd=4.24e+06u as=0p ps=0u
-M1024 a_634_74# a_324_79# a_119_143# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_119_395# SCE VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND GATE a_119_143# VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 GCLK a_1292_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_324_79# CLK VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_634_74# a_354_105# a_744_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 a_119_143# a_354_105# a_634_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 VPWR CLK a_1292_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VPWR a_634_74# a_792_48# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 GCLK a_1292_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 VGND a_1292_368# GCLK VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_119_143# a_324_79# a_634_74# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X8 VGND a_324_79# a_354_105# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR SCE a_119_395# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X10 GCLK a_1292_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 a_119_143# GATE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X12 a_119_395# GATE a_119_143# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X13 a_1292_368# a_792_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 GCLK a_1292_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 GCLK a_1292_368# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 VGND SCE a_119_143# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X17 VPWR a_324_79# a_354_105# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X18 a_324_79# CLK VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X19 a_744_74# a_792_48# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X20 VGND a_1292_368# GCLK VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 a_1292_74# a_792_48# a_1292_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 VPWR a_1292_368# GCLK VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 VPWR a_1292_368# GCLK VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X24 a_634_74# a_324_79# a_788_455# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X25 VGND CLK a_1292_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X26 VGND a_634_74# a_792_48# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 a_788_455# a_792_48# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
 .ends
diff --git a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.cdl b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.cdl
index e9ed3b2..38a11bd 100644
--- a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.cdl
+++ b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.cdl
@@ -17,92 +17,92 @@
 .SUBCKT sky130_fd_sc_ms__sedfxbp_1 CLK D DE SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI14 net86 M1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI14 net86 M1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI637 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 S0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI13 S0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net122 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net114 q1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q_N q1 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 q1 S0 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net131 deneg VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI651 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 net138 sceneg VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI645 Q S0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net122 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 VPWR SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 net143 D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net143 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 net158 q1 VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 deneg DE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 VPWR DE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 sceneg SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI638 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N q1 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net186 q1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net199 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net143 sceneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI643 net114 q1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 q1 S0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI639 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 sceneg SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q_N q1 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net143 D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI659 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 q1 S0 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net223 M1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI33 net131 deneg VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 net138 sceneg VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 VPWR SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 S0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI31 net143 D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 net231 q1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI42 net143 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 net158 q1 VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 deneg DE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 VGND deneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 VPWR DE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 deneg DE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net218 DE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 net247 SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI48 VGND SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 sceneg SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N q1 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net186 q1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net199 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net143 sceneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 q1 S0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 sceneg SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net143 D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 net223 M1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI41 net231 q1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 VGND deneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 deneg DE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 net218 DE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI49 net247 SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI48 VGND SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__sedfxbp_1
diff --git a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.netlist.tsv b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.netlist.tsv
index 2a8dfee..c552e21 100644
--- a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.netlist.tsv
+++ b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.netlist.tsv
@@ -1,46 +1,46 @@
 sky130_fd_sc_ms__sedfxbp_1	CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI14	MOSFET	net86	M1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	S0	clkneg	net86	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net122	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net114	q1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net114	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	q1	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net122	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	q1	S0	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net131	deneg	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	net138	sceneg	db	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	VPWR	SCD	net138	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	net143	D	net131	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net143	SCE	db	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	net158	q1	net143	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	deneg	DE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	VPWR	DE	net158	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	sceneg	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	q1	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net186	q1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net186	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net199	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net199	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net143	sceneg	db	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	q1	S0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	sceneg	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net143	D	net218	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net223	M1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	S0	clkpos	net223	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	net231	q1	net143	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	VGND	deneg	net231	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	deneg	DE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net218	DE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	net247	SCE	db	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI48	MOSFET	VGND	SCD	net247	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net86	M1	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	S0	clkneg	net86	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net122	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net114	q1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net114	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q_N	q1	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net122	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	q1	S0	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net131	deneg	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	net138	sceneg	db	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	VPWR	SCD	net138	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	net143	D	net131	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net143	SCE	db	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	net158	q1	net143	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	deneg	DE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	VPWR	DE	net158	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	sceneg	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	q1	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net186	q1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net186	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net199	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net199	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net143	sceneg	db	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	q1	S0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	sceneg	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net143	D	net218	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net223	M1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	S0	clkpos	net223	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	net231	q1	net143	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	VGND	deneg	net231	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	deneg	DE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net218	DE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	net247	SCE	db	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI48	MOSFET	VGND	SCD	net247	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.spice b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.spice
index bd229ec..43e3e90 100644
--- a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.spice
+++ b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_ms__sedfxbp_1 CLK D DE SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 a_1549_74# a_1351_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=2.80005e+12p ps=2.337e+07u
-M1001 a_1747_118# a_1351_74# a_697_113# VNB nlowvt w=420000u l=150000u
-+  ad=2.478e+11p pd=2.02e+06u as=3.885e+11p ps=4.37e+06u
-M1002 a_1895_118# a_1549_74# a_1747_118# VNB nlowvt w=420000u l=150000u
-+  ad=1.617e+11p pd=1.61e+06u as=0p ps=0u
-M1003 a_575_305# a_2463_74# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1004 Q_N a_575_305# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=2.2449e+12p ps=1.863e+07u
-M1005 VPWR DE a_161_394# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1006 a_27_90# a_575_305# a_533_113# VNB nlowvt w=420000u l=150000u
-+  ad=3.276e+11p pd=3.24e+06u as=1.008e+11p ps=1.32e+06u
-M1007 a_2650_508# a_1549_74# a_2463_74# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.115e+11p ps=2.71e+06u
-M1008 a_1071_462# SCD VPWR VPB pshort w=640000u l=180000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1009 a_1934_508# a_1351_74# a_1747_118# VPB pshort w=420000u l=180000u
-+  ad=1.05e+11p pd=1.34e+06u as=1.344e+11p ps=1.48e+06u
-M1010 a_1747_118# a_1549_74# a_697_113# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=4.823e+11p ps=5.11e+06u
-M1011 a_1549_74# a_1351_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1012 a_119_464# D a_27_90# VPB pshort w=640000u l=180000u
-+  ad=1.344e+11p pd=1.7e+06u as=3.52e+11p ps=3.66e+06u
-M1013 VPWR a_1972_92# a_1934_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Q_N a_575_305# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1015 VPWR a_2463_74# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1016 a_1351_74# CLK VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1017 a_533_113# a_161_394# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_697_113# SCE a_1075_125# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1019 VGND DE a_161_394# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1020 VPWR a_575_305# a_2650_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_157_90# D a_27_90# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1022 VGND DE a_157_90# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1351_74# CLK VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1024 a_2391_74# a_1972_92# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1025 a_2463_74# a_1549_74# a_2391_74# VNB nlowvt w=640000u l=150000u
-+  ad=2.139e+11p pd=2e+06u as=0p ps=0u
-M1026 a_559_464# DE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1027 VGND a_1972_92# a_1895_118# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1075_125# SCD VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_161_394# a_119_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_90# a_575_305# a_559_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_575_305# a_2463_74# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1032 a_697_113# a_667_87# a_1071_462# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_697_113# a_667_87# a_27_90# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_2463_74# a_1351_74# a_2348_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=7.95e+11p ps=3.59e+06u
-M1035 a_1972_92# a_1747_118# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1036 a_2565_74# a_1351_74# a_2463_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1037 VGND a_575_305# a_2565_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR SCE a_667_87# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=2.208e+11p ps=1.97e+06u
-M1039 a_697_113# SCE a_27_90# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1972_92# a_1747_118# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.92e+11p pd=1.88e+06u as=0p ps=0u
-M1041 VGND a_2463_74# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1042 VGND SCE a_667_87# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1043 a_2348_392# a_1972_92# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_1351_74# a_1549_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 VPWR a_2463_74# a_575_305# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 a_1075_125# SCE a_697_113# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 VPWR a_1747_118# a_1972_92# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X4 a_157_90# DE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 a_2650_508# a_575_305# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X6 a_27_90# D a_157_90# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 VGND a_161_394# a_533_113# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X8 a_533_113# a_575_305# a_27_90# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 a_27_90# a_667_87# a_697_113# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 a_161_394# DE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X11 a_2391_74# a_1549_74# a_2463_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 a_27_90# D a_119_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X13 VPWR SCD a_1071_462# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X14 VPWR DE a_559_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X15 a_2348_392# a_1351_74# a_2463_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 a_697_113# a_1549_74# a_1747_118# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X17 a_667_87# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X18 a_1895_118# a_1972_92# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X19 Q a_2463_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 VGND SCD a_1075_125# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X21 a_2463_74# a_1549_74# a_2650_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X22 VGND CLK a_1351_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 a_559_464# a_575_305# a_27_90# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X24 Q a_2463_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 VGND a_1747_118# a_1972_92# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X26 a_27_90# SCE a_697_113# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X27 a_1071_462# a_667_87# a_697_113# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X28 VPWR a_1972_92# a_2348_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X29 a_697_113# a_1351_74# a_1747_118# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X30 a_1747_118# a_1549_74# a_1895_118# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X31 a_119_464# a_161_394# VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X32 a_1747_118# a_1351_74# a_1934_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X33 a_2565_74# a_575_305# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X34 VPWR a_575_305# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X35 a_2463_74# a_1351_74# a_2565_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X36 a_667_87# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X37 VPWR CLK a_1351_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X38 VGND a_2463_74# a_575_305# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X39 VGND a_1972_92# a_2391_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X40 VGND a_575_305# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X41 a_1934_508# a_1972_92# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X42 a_161_394# DE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X43 VGND a_1351_74# a_1549_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.cdl b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.cdl
index c0efe57..9bf823f 100644
--- a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.cdl
+++ b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.cdl
@@ -17,92 +17,92 @@
 .SUBCKT sky130_fd_sc_ms__sedfxbp_2 CLK D DE SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI14 net86 M1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI14 net86 M1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI637 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 S0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI13 S0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S0 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net122 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net114 q1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q_N q1 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 q1 S0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net131 deneg VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI651 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 net138 sceneg VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI645 Q S0 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net122 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 VPWR SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 net143 D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net143 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 net151 q1 VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 deneg DE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 VPWR DE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 sceneg SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI638 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N q1 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net186 q1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S0 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net199 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net143 sceneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI643 net114 q1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 q1 S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI639 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 sceneg SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q_N q1 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net143 D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI659 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 q1 S0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net223 M1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI33 net131 deneg VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 net138 sceneg VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 VPWR SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 S0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI31 net143 D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 net231 q1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI42 net143 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 net151 q1 VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 deneg DE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 VGND deneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 VPWR DE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 deneg DE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net243 DE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 net247 SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI48 VGND SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 sceneg SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N q1 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net186 q1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S0 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net199 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net143 sceneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 q1 S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 sceneg SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net143 D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 net223 M1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI41 net231 q1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 VGND deneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 deneg DE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 net243 DE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI49 net247 SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI48 VGND SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__sedfxbp_2
diff --git a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.netlist.tsv b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.netlist.tsv
index dfb96f8..33680bb 100644
--- a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.netlist.tsv
+++ b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.netlist.tsv
@@ -1,46 +1,46 @@
 sky130_fd_sc_ms__sedfxbp_2	CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI14	MOSFET	net86	M1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	S0	clkneg	net86	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S0	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net122	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net114	q1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net114	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	q1	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net122	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	q1	S0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net131	deneg	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	net138	sceneg	db	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	VPWR	SCD	net138	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	net143	D	net131	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net143	SCE	db	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	net151	q1	net143	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	deneg	DE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	VPWR	DE	net151	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	sceneg	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	q1	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net186	q1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net186	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S0	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net199	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net199	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net143	sceneg	db	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	q1	S0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	sceneg	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net143	D	net243	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net223	M1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	S0	clkpos	net223	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	net231	q1	net143	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	VGND	deneg	net231	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	deneg	DE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net243	DE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	net247	SCE	db	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI48	MOSFET	VGND	SCD	net247	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net86	M1	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	S0	clkneg	net86	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S0	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net122	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net114	q1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net114	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q_N	q1	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net122	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	q1	S0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net131	deneg	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	net138	sceneg	db	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	VPWR	SCD	net138	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	net143	D	net131	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net143	SCE	db	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	net151	q1	net143	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	deneg	DE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	VPWR	DE	net151	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	sceneg	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	q1	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net186	q1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net186	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S0	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net199	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net199	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net143	sceneg	db	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	q1	S0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	sceneg	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net143	D	net243	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net223	M1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	S0	clkpos	net223	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	net231	q1	net143	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	VGND	deneg	net231	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	deneg	DE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net243	DE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	net247	SCE	db	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI48	MOSFET	VGND	SCD	net247	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.spice b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.spice
index eb4037f..b8ecffa 100644
--- a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.spice
+++ b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.spice
@@ -16,100 +16,52 @@
 
 
 .subckt sky130_fd_sc_ms__sedfxbp_2 CLK D DE SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 a_1377_368# CLK VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=3.44925e+12p ps=2.926e+07u
-M1001 a_141_74# D a_32_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.835e+11p ps=3.03e+06u
-M1002 VPWR a_575_87# Q_N VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.024e+11p ps=2.78e+06u
-M1003 VPWR a_183_290# a_135_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1004 a_1586_74# a_1377_368# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=2.61097e+12p ps=2.285e+07u
-M1005 a_32_74# a_575_87# a_527_113# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1006 VPWR a_575_87# a_2675_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 a_2417_74# a_2013_71# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1008 a_1586_74# a_1377_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1009 a_691_113# a_661_87# a_32_74# VNB nlowvt w=420000u l=150000u
-+  ad=3.885e+11p pd=4.37e+06u as=0p ps=0u
-M1010 a_2489_74# a_1586_74# a_2417_74# VNB nlowvt w=640000u l=150000u
-+  ad=2.139e+11p pd=2e+06u as=0p ps=0u
-M1011 a_2591_74# a_1377_368# a_2489_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1012 a_575_87# a_2489_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1013 VPWR DE a_183_290# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1014 VPWR SCE a_661_87# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.856e+11p ps=1.86e+06u
-M1015 a_1784_97# a_1586_74# a_691_113# VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=4.76e+11p ps=5.08e+06u
-M1016 VPWR a_2013_71# a_1947_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
-M1017 a_1091_125# SCD VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1018 a_2013_71# a_1784_97# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1019 a_1947_508# a_1377_368# a_1784_97# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND DE a_183_290# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1021 a_527_113# a_183_290# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_575_87# a_2591_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Q_N a_575_87# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1024 a_32_74# a_575_87# a_581_462# VPB pshort w=640000u l=180000u
-+  ad=3.52e+11p pd=3.66e+06u as=1.344e+11p ps=1.7e+06u
-M1025 VGND a_2013_71# a_1920_97# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.953e+11p ps=1.77e+06u
-M1026 Q a_2489_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1027 a_135_464# D a_32_74# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_691_113# SCE a_32_74# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1377_368# CLK VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1030 a_2675_508# a_1586_74# a_2489_74# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=3.115e+11p ps=2.71e+06u
-M1031 a_1091_453# SCD VPWR VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1032 a_2013_71# a_1784_97# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1033 a_691_113# SCE a_1091_125# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_2489_74# a_1377_368# a_2377_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=7.75e+11p ps=3.55e+06u
-M1035 a_1784_97# a_1377_368# a_691_113# VNB nlowvt w=420000u l=150000u
-+  ad=2.226e+11p pd=1.9e+06u as=0p ps=0u
-M1036 Q a_2489_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1037 VGND SCE a_661_87# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1038 a_1920_97# a_1586_74# a_1784_97# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_2489_74# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_691_113# a_661_87# a_1091_453# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VGND a_575_87# Q_N VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VGND DE a_141_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_2377_392# a_2013_71# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_575_87# a_2489_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1045 a_581_462# DE VPWR VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 Q_N a_575_87# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND a_2489_74# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_575_87# Q_N VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_2591_74# a_575_87# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X2 VGND a_183_290# a_527_113# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 a_141_74# DE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 a_1091_125# SCE a_691_113# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 a_691_113# a_1377_368# a_1784_97# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X6 VPWR a_2489_74# a_575_87# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VGND a_2489_74# a_575_87# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_32_74# SCE a_691_113# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X9 a_661_87# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 VGND a_2013_71# a_2417_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 a_691_113# a_1586_74# a_1784_97# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X12 a_2377_392# a_1377_368# a_2489_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X13 VPWR DE a_581_462# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X14 a_1947_508# a_2013_71# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X15 VPWR SCD a_1091_453# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X16 a_2489_74# a_1377_368# a_2591_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X17 Q a_2489_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 VGND a_2489_74# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 VGND a_1377_368# a_1586_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 Q_N a_575_87# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X21 a_1091_453# a_661_87# a_691_113# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X22 a_2675_508# a_575_87# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X23 a_661_87# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X24 VPWR CLK a_1377_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 a_1784_97# a_1586_74# a_1920_97# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X26 a_2417_74# a_1586_74# a_2489_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X27 a_135_464# a_183_290# VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X28 VGND a_575_87# Q_N VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X29 a_581_462# a_575_87# a_32_74# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X30 a_527_113# a_575_87# a_32_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X31 VPWR a_1377_368# a_1586_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X32 VGND CLK a_1377_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 Q a_2489_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 a_183_290# DE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X35 VPWR a_1784_97# a_2013_71# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X36 a_32_74# D a_141_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X37 a_1784_97# a_1377_368# a_1947_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X38 VGND SCD a_1091_125# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X39 VPWR a_2013_71# a_2377_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X40 a_32_74# D a_135_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X41 a_183_290# DE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X42 VGND a_1784_97# a_2013_71# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X43 Q_N a_575_87# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X44 a_2489_74# a_1586_74# a_2675_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X45 a_1920_97# a_2013_71# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X46 a_32_74# a_661_87# a_691_113# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X47 VPWR a_2489_74# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.cdl b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.cdl
index 3ec4232..ef9ae81 100644
--- a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.cdl
+++ b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.cdl
@@ -16,88 +16,88 @@
 
 .SUBCKT sky130_fd_sc_ms__sedfxtp_1 CLK D DE SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI14 net82 M1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI14 net82 M1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI637 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 S0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI13 S0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S0 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net95 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net110 q1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 q1 S0 VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net123 deneg VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI651 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 net127 sceneg VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI645 Q S0 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net95 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 VPWR SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 net135 D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net135 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 net143 q1 VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 deneg DE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 VPWR DE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 sceneg SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI638 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net171 q1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S0 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net190 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net135 sceneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI643 net110 q1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 q1 S0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI639 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 sceneg SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 q1 S0 VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net135 D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI33 net123 deneg VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 net127 sceneg VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 VPWR SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net211 M1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI31 net135 D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 S0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI42 net135 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 net143 q1 VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 deneg DE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 net222 q1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 VPWR DE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 VGND deneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 deneg DE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net206 DE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 net238 SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI48 VGND SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 sceneg SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net171 q1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S0 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net190 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net135 sceneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 q1 S0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 sceneg SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net135 D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 net211 M1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI41 net222 q1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 VGND deneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 deneg DE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 net206 DE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI49 net238 SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI48 VGND SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__sedfxtp_1
diff --git a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.netlist.tsv b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.netlist.tsv
index f6d589a..9d7adee 100644
--- a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.netlist.tsv
+++ b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_ms__sedfxtp_1	CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI14	MOSFET	net82	M1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	S0	clkneg	net82	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S0	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net95	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net110	q1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net110	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net95	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	q1	S0	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net123	deneg	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	net127	sceneg	db	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	VPWR	SCD	net127	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	net135	D	net123	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net135	SCE	db	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	net143	q1	net135	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	deneg	DE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	VPWR	DE	net143	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	sceneg	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net171	q1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net171	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S0	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net190	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net190	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net135	sceneg	db	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	q1	S0	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	sceneg	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net135	D	net206	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net211	M1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	S0	clkpos	net211	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	net222	q1	net135	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	VGND	deneg	net222	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	deneg	DE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net206	DE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	net238	SCE	db	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI48	MOSFET	VGND	SCD	net238	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net82	M1	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	S0	clkneg	net82	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S0	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net95	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net110	q1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net110	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net95	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	q1	S0	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net123	deneg	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	net127	sceneg	db	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	VPWR	SCD	net127	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	net135	D	net123	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net135	SCE	db	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	net143	q1	net135	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	deneg	DE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	VPWR	DE	net143	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	sceneg	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net171	q1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net171	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S0	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net190	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net190	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net135	sceneg	db	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	q1	S0	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	sceneg	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net135	D	net206	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net211	M1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	S0	clkpos	net211	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	net222	q1	net135	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	VGND	deneg	net222	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	deneg	DE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net206	DE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	net238	SCE	db	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI48	MOSFET	VGND	SCD	net238	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.spice b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.spice
index 271c535..ad3c2bd 100644
--- a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.spice
+++ b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.spice
@@ -16,88 +16,46 @@
 
 
 .subckt sky130_fd_sc_ms__sedfxtp_1 CLK D DE SCD SCE VGND VNB VPB VPWR Q
-M1000 VPWR a_2385_74# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=2.51215e+12p pd=2.218e+07u as=2.912e+11p ps=2.76e+06u
-M1001 a_557_463# DE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1002 VGND DE a_143_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.9208e+12p pd=1.749e+07u as=1.008e+11p ps=1.32e+06u
-M1003 VGND a_2385_74# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1004 a_1492_74# a_1295_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1005 a_1056_455# SCD VPWR VPB pshort w=640000u l=180000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1006 a_1295_74# CLK VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1007 VGND DE a_159_404# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1008 a_505_111# a_159_404# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1009 a_1910_71# a_1688_97# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.184e+11p pd=2.2e+06u as=0p ps=0u
-M1010 a_143_74# D a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.982e+11p ps=3.1e+06u
-M1011 a_1295_74# CLK VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1012 a_2385_74# a_1295_74# a_2277_392# VPB pshort w=1e+06u l=180000u
-+  ad=3.115e+11p pd=2.71e+06u as=7.55e+11p ps=3.51e+06u
-M1013 a_547_301# a_2385_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1014 VPWR SCE a_639_85# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1015 a_27_74# a_547_301# a_557_463# VPB pshort w=640000u l=180000u
-+  ad=3.456e+11p pd=3.64e+06u as=0p ps=0u
-M1016 a_2313_74# a_1910_71# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1017 a_1492_74# a_1295_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1018 a_2385_74# a_1492_74# a_2313_74# VNB nlowvt w=640000u l=150000u
-+  ad=2.139e+11p pd=2e+06u as=0p ps=0u
-M1019 a_669_111# SCE a_27_74# VPB pshort w=640000u l=180000u
-+  ad=4.441e+11p pd=4.97e+06u as=0p ps=0u
-M1020 a_669_111# a_639_85# a_1056_455# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR DE a_159_404# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1022 a_669_111# a_639_85# a_27_74# VNB nlowvt w=420000u l=150000u
-+  ad=3.843e+11p pd=4.35e+06u as=0p ps=0u
-M1023 a_1688_97# a_1295_74# a_669_111# VNB nlowvt w=420000u l=150000u
-+  ad=2.226e+11p pd=1.9e+06u as=0p ps=0u
-M1024 a_117_464# D a_27_74# VPB pshort w=640000u l=180000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1025 a_2571_508# a_1492_74# a_2385_74# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1026 a_1688_97# a_1492_74# a_669_111# VPB pshort w=420000u l=180000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1027 a_1893_508# a_1295_74# a_1688_97# VPB pshort w=420000u l=180000u
-+  ad=1.05e+11p pd=1.34e+06u as=0p ps=0u
-M1028 a_669_111# SCE a_1026_125# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1029 VGND a_1910_71# a_1824_97# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.806e+11p ps=1.7e+06u
-M1030 VPWR a_1910_71# a_1893_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1026_125# SCD VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1824_97# a_1492_74# a_1688_97# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1910_71# a_1688_97# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1034 a_547_301# a_2385_74# VPWR VPB pshort w=640000u l=180000u
-+  ad=1.664e+11p pd=1.8e+06u as=0p ps=0u
-M1035 a_2487_74# a_1295_74# a_2385_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1036 VGND a_547_301# a_2487_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR a_547_301# a_2571_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR a_159_404# a_117_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_27_74# a_547_301# a_505_111# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND SCE a_639_85# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1041 a_2277_392# a_1910_71# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1824_97# a_1910_71# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X1 VGND a_1910_71# a_2313_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_639_85# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 a_27_74# SCE a_669_111# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X4 VGND a_2385_74# a_547_301# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 a_1688_97# a_1295_74# a_1893_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X6 a_1026_125# SCE a_669_111# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 a_159_404# DE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X8 VPWR a_1295_74# a_1492_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X9 a_143_74# DE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 VPWR DE a_557_463# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X11 VPWR SCD a_1056_455# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X12 VGND a_1295_74# a_1492_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_1688_97# a_1492_74# a_1824_97# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X14 a_2277_392# a_1295_74# a_2385_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X15 a_2313_74# a_1492_74# a_2385_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X16 a_505_111# a_547_301# a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X17 a_27_74# a_639_85# a_669_111# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X18 VGND CLK a_1295_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_1893_508# a_1910_71# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X20 VGND SCD a_1026_125# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X21 a_2385_74# a_1492_74# a_2571_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X22 VPWR a_2385_74# a_547_301# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X23 a_117_464# a_159_404# VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X24 a_557_463# a_547_301# a_27_74# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X25 a_1056_455# a_639_85# a_669_111# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X26 a_27_74# D a_143_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 a_159_404# DE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X28 a_2571_508# a_547_301# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X29 VPWR a_1910_71# a_2277_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X30 VGND a_1688_97# a_1910_71# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X31 Q a_2385_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X32 a_639_85# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X33 Q a_2385_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X34 a_27_74# D a_117_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X35 a_2487_74# a_547_301# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X36 VGND a_159_404# a_505_111# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X37 a_669_111# a_1295_74# a_1688_97# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X38 a_2385_74# a_1295_74# a_2487_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X39 VPWR CLK a_1295_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X40 a_669_111# a_1492_74# a_1688_97# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X41 VPWR a_1688_97# a_1910_71# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
 .ends
diff --git a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.cdl b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.cdl
index 1817c74..9fa3a06 100644
--- a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.cdl
+++ b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.cdl
@@ -16,88 +16,88 @@
 
 .SUBCKT sky130_fd_sc_ms__sedfxtp_2 CLK D DE SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI14 net82 M1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI14 net82 M1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI637 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 S0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI13 S0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S0 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net114 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net110 q1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 q1 S0 VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net123 deneg VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI651 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 net130 sceneg VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI645 Q S0 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net114 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 VPWR SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 net135 D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net135 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 net150 q1 VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 deneg DE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 VPWR DE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 sceneg SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI638 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net174 q1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S0 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net187 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net135 sceneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI643 net110 q1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 q1 S0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI639 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 sceneg SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 q1 S0 VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net135 D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI33 net123 deneg VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 net130 sceneg VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 VPWR SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net211 M1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI31 net135 D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 S0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI42 net135 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 net150 q1 VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 deneg DE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 net219 q1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 VPWR DE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 VGND deneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 deneg DE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net206 DE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 net235 SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI48 VGND SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 sceneg SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net174 q1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S0 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net187 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net135 sceneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 q1 S0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 sceneg SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net135 D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 net211 M1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI41 net219 q1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 VGND deneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 deneg DE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 net206 DE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI49 net235 SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI48 VGND SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__sedfxtp_2
diff --git a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.netlist.tsv b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.netlist.tsv
index e4e4e7b..b195bed 100644
--- a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.netlist.tsv
+++ b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_ms__sedfxtp_2	CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI14	MOSFET	net82	M1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	S0	clkneg	net82	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S0	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net114	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net110	q1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net110	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net114	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	q1	S0	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net123	deneg	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	net130	sceneg	db	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	VPWR	SCD	net130	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	net135	D	net123	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net135	SCE	db	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	net150	q1	net135	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	deneg	DE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	VPWR	DE	net150	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	sceneg	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net174	q1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net174	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S0	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net187	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net187	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net135	sceneg	db	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	q1	S0	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	sceneg	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net135	D	net206	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net211	M1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	S0	clkpos	net211	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	net219	q1	net135	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	VGND	deneg	net219	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	deneg	DE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net206	DE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	net235	SCE	db	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI48	MOSFET	VGND	SCD	net235	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net82	M1	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	S0	clkneg	net82	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S0	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net114	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net110	q1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net110	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net114	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	q1	S0	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net123	deneg	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	net130	sceneg	db	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	VPWR	SCD	net130	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	net135	D	net123	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net135	SCE	db	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	net150	q1	net135	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	deneg	DE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	VPWR	DE	net150	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	sceneg	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net174	q1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net174	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S0	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net187	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net187	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net135	sceneg	db	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	q1	S0	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	sceneg	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net135	D	net206	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net211	M1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	S0	clkpos	net211	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	net219	q1	net135	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	VGND	deneg	net219	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	deneg	DE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net206	DE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	net235	SCE	db	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI48	MOSFET	VGND	SCD	net235	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.spice b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.spice
index f547df4..8424bfe 100644
--- a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.spice
+++ b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_ms__sedfxtp_2 CLK D DE SCD SCE VGND VNB VPB VPWR Q
-M1000 a_2660_508# a_1538_74# a_2474_74# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.962e+11p ps=2.72e+06u
-M1001 a_2474_74# a_1538_74# a_2402_74# VNB nlowvt w=640000u l=150000u
-+  ad=1.915e+11p pd=1.93e+06u as=1.344e+11p ps=1.7e+06u
-M1002 a_693_113# a_663_87# a_1082_455# VPB pshort w=640000u l=180000u
-+  ad=4.728e+11p pd=5.07e+06u as=1.536e+11p ps=1.76e+06u
-M1003 a_1068_125# SCD VGND VNB nlowvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.2744e+12p ps=1.998e+07u
-M1004 a_1340_74# CLK VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1005 VPWR DE a_180_290# VPB pshort w=640000u l=180000u
-+  ad=2.92365e+12p pd=2.518e+07u as=1.792e+11p ps=1.84e+06u
-M1006 VPWR SCE a_663_87# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.76e+11p ps=1.83e+06u
-M1007 a_1736_97# a_1538_74# a_693_113# VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1008 a_693_113# SCE a_1068_125# VNB nlowvt w=420000u l=150000u
-+  ad=3.885e+11p pd=4.37e+06u as=0p ps=0u
-M1009 a_548_87# a_2474_74# VPWR VPB pshort w=640000u l=180000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1010 Q a_2474_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.192e+11p pd=2.81e+06u as=0p ps=0u
-M1011 a_1939_508# a_1340_74# a_1736_97# VPB pshort w=420000u l=180000u
-+  ad=1.554e+11p pd=1.58e+06u as=0p ps=0u
-M1012 a_138_74# D a_40_464# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.982e+11p ps=3.1e+06u
-M1013 a_1538_74# a_1340_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1014 a_1979_71# a_1736_97# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1015 VPWR a_548_87# a_2660_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_40_464# a_548_87# a_578_463# VPB pshort w=640000u l=180000u
-+  ad=3.52e+11p pd=3.66e+06u as=1.344e+11p ps=1.7e+06u
-M1017 Q a_2474_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1018 a_132_464# D a_40_464# VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1019 a_693_113# SCE a_40_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1736_97# a_1340_74# a_693_113# VNB nlowvt w=420000u l=150000u
-+  ad=2.226e+11p pd=1.9e+06u as=0p ps=0u
-M1021 VGND DE a_180_290# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1022 a_2360_392# a_1979_71# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=7.8e+11p pd=3.56e+06u as=0p ps=0u
-M1023 a_500_113# a_180_290# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1024 VPWR a_1979_71# a_1939_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_2474_74# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1082_455# SCD VPWR VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1872_97# a_1538_74# a_1736_97# VNB nlowvt w=420000u l=150000u
-+  ad=2.247e+11p pd=1.91e+06u as=0p ps=0u
-M1028 a_1979_71# a_1736_97# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1029 VGND a_1979_71# a_1872_97# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_578_463# DE VPWR VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_2569_74# a_1340_74# a_2474_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1032 VGND a_548_87# a_2569_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_548_87# a_2474_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1034 a_1340_74# CLK VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1035 a_1538_74# a_1340_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1036 a_40_464# a_548_87# a_500_113# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_693_113# a_663_87# a_40_464# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR a_180_290# a_132_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND DE a_138_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND SCE a_663_87# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1041 VGND a_2474_74# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_2474_74# a_1340_74# a_2360_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_2402_74# a_1979_71# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_40_464# a_663_87# a_693_113# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X1 VGND a_1340_74# a_1538_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 a_1736_97# a_1538_74# a_1872_97# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 a_1872_97# a_1979_71# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 VPWR a_1736_97# a_1979_71# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 a_1068_125# SCE a_693_113# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X6 a_2474_74# a_1538_74# a_2660_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X7 VPWR a_2474_74# a_548_87# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X8 a_132_464# a_180_290# VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X9 VGND a_180_290# a_500_113# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 a_2402_74# a_1538_74# a_2474_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 VPWR a_2474_74# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 Q a_2474_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_2569_74# a_548_87# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X14 a_1082_455# a_663_87# a_693_113# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X15 VPWR a_1340_74# a_1538_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X16 a_693_113# a_1538_74# a_1736_97# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X17 a_40_464# SCE a_693_113# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X18 a_2360_392# a_1340_74# a_2474_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X19 a_2660_508# a_548_87# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X20 a_2474_74# a_1340_74# a_2569_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X21 a_40_464# D a_132_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X22 a_1939_508# a_1979_71# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X23 VPWR DE a_578_463# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X24 a_138_74# DE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X25 a_500_113# a_548_87# a_40_464# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X26 VPWR SCD a_1082_455# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X27 VGND CLK a_1340_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 VPWR CLK a_1340_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X29 a_693_113# a_1340_74# a_1736_97# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X30 a_578_463# a_548_87# a_40_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X31 VGND a_2474_74# a_548_87# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X32 a_1736_97# a_1340_74# a_1939_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X33 Q a_2474_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X34 a_180_290# DE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X35 VGND a_1979_71# a_2402_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X36 a_40_464# D a_138_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X37 VGND SCD a_1068_125# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X38 VGND a_1736_97# a_1979_71# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X39 a_663_87# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X40 VPWR a_1979_71# a_2360_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X41 a_663_87# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X42 VGND a_2474_74# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X43 a_180_290# DE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.cdl b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.cdl
index 4d6ae6b..97c57a7 100644
--- a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.cdl
+++ b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.cdl
@@ -16,88 +16,88 @@
 
 .SUBCKT sky130_fd_sc_ms__sedfxtp_4 CLK D DE SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI14 net82 M1 VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI14 net82 M1 VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265
+MI637 clkpos clkneg VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 S0 clkneg VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI13 S0 clkneg VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S0 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net95 M1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net110 q1 VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 q1 S0 VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net123 deneg VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI651 db clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 net130 sceneg VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI645 Q S0 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net95 M1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 VPWR SCD VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 net135 D VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net135 SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 net150 q1 VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 deneg DE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 VPWR DE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 sceneg SCE VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI638 clkneg CLK VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net171 q1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S0 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net187 M1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net135 sceneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI643 net110 q1 VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 q1 S0 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI639 M1 M0 VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 sceneg SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 q1 S0 VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net135 D VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI33 net123 deneg VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 net130 sceneg VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 VPWR SCD VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net211 M1 VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI31 net135 D VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 S0 clkpos VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI42 net135 SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 net150 q1 VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 deneg DE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 net219 q1 VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 VPWR DE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 VGND deneg VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 deneg DE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net206 DE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 net238 SCE VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI48 VGND SCD VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 sceneg SCE VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net171 q1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S0 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net187 M1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 M0 clkpos VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net135 sceneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 q1 S0 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 sceneg SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net135 D VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 net211 M1 VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 S0 clkpos VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI41 net219 q1 VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 VGND deneg VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 deneg DE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 net206 DE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI49 net238 SCE VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI48 VGND SCD VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__sedfxtp_4
diff --git a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.netlist.tsv b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.netlist.tsv
index 1016b48..d408f0e 100644
--- a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.netlist.tsv
+++ b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_ms__sedfxtp_4	CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI14	MOSFET	net82	M1	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	S0	clkneg	net82	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S0	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net95	M1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net110	q1	VPWR	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net110	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net95	VPB	pshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	q1	S0	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net123	deneg	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	net130	sceneg	db	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	VPWR	SCD	net130	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	net135	D	net123	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net135	SCE	db	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	net150	q1	net135	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	deneg	DE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	VPWR	DE	net150	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	sceneg	SCE	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net171	q1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net171	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S0	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net187	M1	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net187	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net135	sceneg	db	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	q1	S0	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	sceneg	SCE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net135	D	net206	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net211	M1	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	S0	clkpos	net211	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	net219	q1	net135	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	VGND	deneg	net219	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	deneg	DE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net206	DE	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	net238	SCE	db	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI48	MOSFET	VGND	SCD	net238	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net82	M1	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	S0	clkneg	net82	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S0	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net95	M1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net110	q1	VPWR	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net110	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net95	VPB	pfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	q1	S0	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net123	deneg	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	net130	sceneg	db	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	VPWR	SCD	net130	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	net135	D	net123	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net135	SCE	db	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	net150	q1	net135	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	deneg	DE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	VPWR	DE	net150	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	sceneg	SCE	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net171	q1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net171	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S0	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net187	M1	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net187	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net135	sceneg	db	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	q1	S0	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	sceneg	SCE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net135	D	net206	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net211	M1	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	S0	clkpos	net211	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	net219	q1	net135	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	VGND	deneg	net219	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	deneg	DE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net206	DE	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	net238	SCE	db	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI48	MOSFET	VGND	SCD	net238	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.spice b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.spice
index 4643f9e..860198e 100644
--- a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.spice
+++ b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.spice
@@ -16,100 +16,52 @@
 
 
 .subckt sky130_fd_sc_ms__sedfxtp_4 CLK D DE SCD SCE VGND VNB VPB VPWR Q
-M1000 a_2589_508# a_1510_74# a_2403_74# VPB pshort w=420000u l=180000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.836e+11p ps=2.66e+06u
-M1001 a_575_463# DE VPWR VPB pshort w=640000u l=180000u
-+  ad=1.344e+11p pd=1.7e+06u as=3.10925e+12p ps=2.772e+07u
-M1002 a_135_74# D a_37_464# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.373e+11p ps=2.81e+06u
-M1003 a_661_113# SCE a_1044_125# VNB nlowvt w=420000u l=150000u
-+  ad=5.502e+11p pd=5.14e+06u as=8.82e+10p ps=1.26e+06u
-M1004 a_129_464# D a_37_464# VPB pshort w=640000u l=180000u
-+  ad=1.536e+11p pd=1.76e+06u as=3.52e+11p ps=3.66e+06u
-M1005 a_1074_455# SCD VPWR VPB pshort w=640000u l=180000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1006 VGND DE a_177_290# VNB nlowvt w=420000u l=150000u
-+  ad=2.3264e+12p pd=2.159e+07u as=1.197e+11p ps=1.41e+06u
-M1007 a_1044_125# SCD VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_545_87# a_2589_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_177_290# a_129_464# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1313_74# CLK VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1011 a_1510_74# a_1313_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1012 Q a_2403_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1013 a_2498_74# a_1313_74# a_2403_74# VNB nlowvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.915e+11p ps=1.93e+06u
-M1014 VGND a_545_87# a_2498_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1510_74# a_1313_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.912e+11p pd=2.76e+06u as=0p ps=0u
-M1016 a_545_87# a_2403_74# VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1017 Q a_2403_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.255e+11p pd=4.11e+06u as=0p ps=0u
-M1018 a_37_464# a_545_87# a_497_113# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1019 a_661_113# a_631_87# a_37_464# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1313_74# CLK VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1021 a_1943_53# a_1756_97# VPWR VPB pshort w=840000u l=180000u
-+  ad=2.184e+11p pd=2.2e+06u as=0p ps=0u
-M1022 a_2403_74# a_1510_74# a_2331_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1023 a_37_464# a_545_87# a_575_463# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR SCE a_631_87# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1025 VGND a_1943_53# a_1858_79# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.785e+11p ps=1.69e+06u
-M1026 VGND DE a_135_74# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_661_113# SCE a_37_464# VPB pshort w=640000u l=180000u
-+  ad=4.452e+11p pd=4.97e+06u as=0p ps=0u
-M1028 a_661_113# a_631_87# a_1074_455# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR DE a_177_290# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1030 a_545_87# a_2403_74# VPWR VPB pshort w=640000u l=180000u
-+  ad=1.664e+11p pd=1.8e+06u as=0p ps=0u
-M1031 a_1858_79# a_1510_74# a_1756_97# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.6695e+11p ps=1.74e+06u
-M1032 VPWR a_2403_74# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1756_97# a_1510_74# a_661_113# VPB pshort w=420000u l=180000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1034 a_497_113# a_177_290# VGND VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_2403_74# a_1313_74# a_2295_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=7.8e+11p ps=3.56e+06u
-M1036 VPWR a_1943_53# a_1902_508# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1037 VGND a_2403_74# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1756_97# a_1313_74# a_661_113# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 Q a_2403_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND a_2403_74# Q VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 Q a_2403_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_1902_508# a_1313_74# a_1756_97# VPB pshort w=420000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND SCE a_631_87# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1044 a_2295_392# a_1943_53# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VPWR a_2403_74# Q VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_1943_53# a_1756_97# VGND VNB nlowvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1047 a_2331_74# a_1943_53# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_37_464# D a_129_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X1 a_1902_508# a_1943_53# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X2 a_1858_79# a_1943_53# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 VPWR CLK a_1313_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_1756_97# a_1313_74# a_1902_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X5 VGND a_2403_74# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VGND SCD a_1044_125# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 Q a_2403_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_631_87# SCE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X9 a_2403_74# a_1510_74# a_2589_508# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X10 a_129_464# a_177_290# VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X11 a_37_464# D a_135_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X12 VPWR a_2403_74# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 a_37_464# SCE a_661_113# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X14 a_2589_508# a_545_87# VPWR VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X15 a_497_113# a_545_87# a_37_464# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X16 VGND a_2403_74# Q VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X17 a_177_290# DE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X18 VPWR a_2403_74# Q VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 VGND a_2403_74# a_545_87# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X20 VPWR DE a_575_463# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X21 a_661_113# a_1510_74# a_1756_97# VPB sky130_fd_pr__pfet_01v8 w=420000u l=180000u
+X22 Q a_2403_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 VPWR SCD a_1074_455# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X24 a_1756_97# a_1510_74# a_1858_79# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X25 VPWR a_1313_74# a_1510_74# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 a_37_464# a_631_87# a_661_113# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X27 VPWR a_2403_74# a_545_87# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X28 a_1044_125# SCE a_661_113# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X29 VGND a_1943_53# a_2331_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X30 VPWR a_1756_97# a_1943_53# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X31 VGND a_1756_97# a_1943_53# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X32 VGND a_1313_74# a_1510_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X33 a_2295_392# a_1313_74# a_2403_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X34 a_2331_74# a_1510_74# a_2403_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X35 Q a_2403_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X36 a_575_463# a_545_87# a_37_464# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X37 a_661_113# a_1313_74# a_1756_97# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X38 a_2498_74# a_545_87# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X39 a_1074_455# a_631_87# a_661_113# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X40 VGND a_177_290# a_497_113# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X41 VGND CLK a_1313_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X42 VPWR a_1943_53# a_2295_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X43 Q a_2403_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X44 a_177_290# DE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X45 a_2403_74# a_1313_74# a_2498_74# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X46 a_631_87# SCE VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X47 a_135_74# DE VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
 .ends
diff --git a/cells/xnor2/sky130_fd_sc_ms__xnor2_1.cdl b/cells/xnor2/sky130_fd_sc_ms__xnor2_1.cdl
index ce05d70..ce34084 100644
--- a/cells/xnor2/sky130_fd_sc_ms__xnor2_1.cdl
+++ b/cells/xnor2/sky130_fd_sc_ms__xnor2_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__xnor2_1 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR A VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPA B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand0 VGND A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand1 sndNA B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 nmid A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 nmid B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 Y inand VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPA B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPB pfet_01v8 m=1 w=1.12 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_ms__xnor2_1
diff --git a/cells/xnor2/sky130_fd_sc_ms__xnor2_1.netlist.tsv b/cells/xnor2/sky130_fd_sc_ms__xnor2_1.netlist.tsv
index b8092ad..3401f1c 100644
--- a/cells/xnor2/sky130_fd_sc_ms__xnor2_1.netlist.tsv
+++ b/cells/xnor2/sky130_fd_sc_ms__xnor2_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__xnor2_1	A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNnand0	MOSFET	VGND	A	sndNA	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	inand	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	A	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	B	VPWR	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPA	B	Y	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	inand	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	A	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	B	VPWR	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPA	B	Y	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor2/sky130_fd_sc_ms__xnor2_1.spice b/cells/xnor2/sky130_fd_sc_ms__xnor2_1.spice
index 5f6dad8..0acd0c6 100644
--- a/cells/xnor2/sky130_fd_sc_ms__xnor2_1.spice
+++ b/cells/xnor2/sky130_fd_sc_ms__xnor2_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__xnor2_1 A B VGND VNB VPB VPWR Y
-M1000 VGND A a_293_74# VNB nlowvt w=740000u l=150000u
-+  ad=5.4e+11p pd=4.52e+06u as=4.107e+11p ps=4.07e+06u
-M1001 VPWR B a_141_385# VPB pshort w=840000u l=180000u
-+  ad=1.13705e+12p pd=8.5e+06u as=2.268e+11p ps=2.22e+06u
-M1002 a_141_385# B a_112_119# VNB nlowvt w=640000u l=150000u
-+  ad=1.76e+11p pd=1.83e+06u as=1.344e+11p ps=1.7e+06u
-M1003 a_379_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=2.688e+11p pd=2.72e+06u as=0p ps=0u
-M1004 Y a_141_385# a_293_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.294e+11p pd=2.1e+06u as=0p ps=0u
-M1005 Y B a_379_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=4.368e+11p pd=3.02e+06u as=0p ps=0u
-M1006 a_112_119# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_141_385# A VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_293_74# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_141_385# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_293_74# a_141_385# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_112_119# B a_141_385# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 VGND B a_293_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X3 VPWR A a_141_385# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X4 a_141_385# B VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X5 VGND A a_112_119# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X6 Y a_141_385# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 VPWR A a_379_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_293_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_379_368# B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/xnor2/sky130_fd_sc_ms__xnor2_2.cdl b/cells/xnor2/sky130_fd_sc_ms__xnor2_2.cdl
index b11f393..a44ca7f 100644
--- a/cells/xnor2/sky130_fd_sc_ms__xnor2_2.cdl
+++ b/cells/xnor2/sky130_fd_sc_ms__xnor2_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__xnor2_2 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid A VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR A VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPA B VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand0 VGND A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand1 sndNA B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 nmid A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 nmid B VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 Y inand VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR A VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPA B VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPB pfet_01v8 m=2 w=1.12 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_ms__xnor2_2
diff --git a/cells/xnor2/sky130_fd_sc_ms__xnor2_2.netlist.tsv b/cells/xnor2/sky130_fd_sc_ms__xnor2_2.netlist.tsv
index 2b6685e..2171e7a 100644
--- a/cells/xnor2/sky130_fd_sc_ms__xnor2_2.netlist.tsv
+++ b/cells/xnor2/sky130_fd_sc_ms__xnor2_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__xnor2_2	A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNnand0	MOSFET	VGND	A	sndNA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	inand	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	A	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	B	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPA	B	Y	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	inand	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	A	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	B	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPA	B	Y	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor2/sky130_fd_sc_ms__xnor2_2.spice b/cells/xnor2/sky130_fd_sc_ms__xnor2_2.spice
index 5ecdca4..ad3f4ab 100644
--- a/cells/xnor2/sky130_fd_sc_ms__xnor2_2.spice
+++ b/cells/xnor2/sky130_fd_sc_ms__xnor2_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ms__xnor2_2 A B VGND VNB VPB VPWR Y
-M1000 Y B a_641_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=8.894e+11p ps=6.2e+06u
-M1001 a_340_107# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=8.30525e+11p pd=8.22e+06u as=1.024e+12p ps=7.92e+06u
-M1002 VPWR A a_641_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=2.16185e+12p pd=1.301e+07u as=0p ps=0u
-M1003 a_641_368# B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y a_136_368# a_340_107# VNB nlowvt w=740000u l=150000u
-+  ad=4.008e+11p pd=2.67e+06u as=0p ps=0u
-M1005 VGND B a_340_107# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A a_340_107# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_340_107# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_641_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_136_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_136_368# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_136_368# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=3.15e+11p pd=2.63e+06u as=0p ps=0u
-M1012 VPWR B a_136_368# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_136_368# B a_151_74# VNB nlowvt w=740000u l=150000u
-+  ad=2.06875e+11p pd=2.05e+06u as=1.776e+11p ps=1.96e+06u
-M1014 a_151_74# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_340_107# a_136_368# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A a_340_107# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VPWR A a_136_368# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 VPWR A a_641_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_641_368# B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_151_74# B a_136_368# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_340_107# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 Y a_136_368# a_340_107# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR a_136_368# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_136_368# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X9 a_340_107# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 VGND B a_340_107# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X11 Y B a_641_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 Y a_136_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X13 VGND A a_151_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_641_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_340_107# a_136_368# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/xnor2/sky130_fd_sc_ms__xnor2_4.cdl b/cells/xnor2/sky130_fd_sc_ms__xnor2_4.cdl
index aec971d..5614b79 100644
--- a/cells/xnor2/sky130_fd_sc_ms__xnor2_4.cdl
+++ b/cells/xnor2/sky130_fd_sc_ms__xnor2_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__xnor2_4 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA B VNB nlowvt m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid A VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand B VPB pshort m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR A VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPA B VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand0 VGND A VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand1 sndNA B VNB nfet_01v8_lvt m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 nmid A VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 nmid B VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 Y inand VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand B VPB pfet_01v8 m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR A VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPA B VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPB pfet_01v8 m=2 w=1.12 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_ms__xnor2_4
diff --git a/cells/xnor2/sky130_fd_sc_ms__xnor2_4.netlist.tsv b/cells/xnor2/sky130_fd_sc_ms__xnor2_4.netlist.tsv
index 6b08b01..6b5d0b4 100644
--- a/cells/xnor2/sky130_fd_sc_ms__xnor2_4.netlist.tsv
+++ b/cells/xnor2/sky130_fd_sc_ms__xnor2_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__xnor2_4	A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNnand0	MOSFET	VGND	A	sndNA	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	inand	VNB	nlowvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	A	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	B	VPWR	VPB	pshort	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPA	B	Y	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	inand	VNB	nfet_01v8_lvt	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	A	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	B	VPWR	VPB	pfet_01v8	2	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPA	B	Y	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor2/sky130_fd_sc_ms__xnor2_4.spice b/cells/xnor2/sky130_fd_sc_ms__xnor2_4.spice
index aab0c17..156ec25 100644
--- a/cells/xnor2/sky130_fd_sc_ms__xnor2_4.spice
+++ b/cells/xnor2/sky130_fd_sc_ms__xnor2_4.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_ms__xnor2_4 A B VGND VNB VPB VPWR Y
-M1000 a_950_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=1.5344e+12p pd=1.394e+07u as=2.62112e+12p ps=1.87e+07u
-M1001 VGND B a_511_74# VNB nlowvt w=740000u l=150000u
-+  ad=1.7674e+12p pd=1.293e+07u as=1.6317e+12p ps=1.477e+07u
-M1002 a_511_74# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B a_950_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=9.072e+11p pd=8.34e+06u as=0p ps=0u
-M1004 a_950_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_950_368# B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_950_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_950_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B a_950_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A a_511_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_511_74# a_119_368# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.662e+11p ps=4.22e+06u
-M1011 a_950_368# B Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_119_368# A VPWR VPB pshort w=840000u l=180000u
-+  ad=4.536e+11p pd=4.44e+06u as=0p ps=0u
-M1013 VPWR A a_119_368# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_511_74# a_119_368# Y VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_511_74# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND B a_511_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y a_119_368# a_511_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_119_368# B VPWR VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_74# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=5.44e+11p pd=5.54e+06u as=0p ps=0u
-M1020 VPWR B a_119_368# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A a_511_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_74# B a_119_368# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.24e+11p ps=1.98e+06u
-M1023 a_511_74# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_511_74# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y a_119_368# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_119_368# B a_27_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_119_368# Y VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND A a_27_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y a_119_368# a_511_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# B a_119_368# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 a_511_74# a_119_368# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X2 Y B a_950_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 Y a_119_368# a_511_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_511_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_950_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_119_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X7 Y a_119_368# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 a_511_74# a_119_368# Y VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 Y a_119_368# a_511_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_119_368# B VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X11 a_511_74# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VGND B a_511_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_950_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 a_950_368# B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_511_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_950_368# B Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VPWR A a_950_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 VGND A a_511_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 VPWR A a_119_368# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X20 VGND A a_511_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 VPWR a_119_368# Y VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 VGND B a_511_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X23 VPWR B a_119_368# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X24 VGND A a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X25 a_119_368# B a_27_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X26 a_511_74# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 VPWR A a_950_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X28 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X29 Y B a_950_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/xnor3/sky130_fd_sc_ms__xnor3_1.cdl b/cells/xnor3/sky130_fd_sc_ms__xnor3_1.cdl
index ce03411..8f58288 100644
--- a/cells/xnor3/sky130_fd_sc_ms__xnor3_1.cdl
+++ b/cells/xnor3/sky130_fd_sc_ms__xnor3_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ms__xnor3_1 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN3 X net69 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X net69 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI29 Ab Bb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 Abb Bb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 Bb B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 Ab Bb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 mid1 Cb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 Ab A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 Cb C VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI2 mid2 C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 Abb Ab VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 Ab B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 mid1 Cb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI28 Abb B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 X net69 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI650 mid1 C VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI27 mid2 B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI47 Abb Ab VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI23 mid1 B VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI26 mid2 Bb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 mid2 Cb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X net69 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI33 Cb C VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 C VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI45 Ab A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI16 Bb B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 mid1 B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 mid2 Cb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 mid1 Bb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI19 mid1 Bb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__xnor3_1
diff --git a/cells/xnor3/sky130_fd_sc_ms__xnor3_1.netlist.tsv b/cells/xnor3/sky130_fd_sc_ms__xnor3_1.netlist.tsv
index fd55b82..d79e82a 100644
--- a/cells/xnor3/sky130_fd_sc_ms__xnor3_1.netlist.tsv
+++ b/cells/xnor3/sky130_fd_sc_ms__xnor3_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ms__xnor3_1	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN3	MOSFET	X	net69	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	Ab	Bb	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Abb	Bb	mid1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	mid1	Cb	net69	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	Cb	C	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	mid2	C	net69	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Ab	B	mid1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	Abb	B	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	net69	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	C	net69	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	mid2	Cb	net69	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net69	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	Ab	Bb	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Abb	Bb	mid1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	mid1	Cb	net69	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	Cb	C	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	mid2	C	net69	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Ab	B	mid1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	Abb	B	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	net69	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	mid1	C	net69	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	mid2	B	Ab	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	mid1	B	Abb	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	mid2	Bb	Abb	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	mid2	Cb	net69	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	Cb	C	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	mid1	Bb	Ab	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor3/sky130_fd_sc_ms__xnor3_1.spice b/cells/xnor3/sky130_fd_sc_ms__xnor3_1.spice
index 2b90ab6..7cbfef9 100644
--- a/cells/xnor3/sky130_fd_sc_ms__xnor3_1.spice
+++ b/cells/xnor3/sky130_fd_sc_ms__xnor3_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ms__xnor3_1 A B C VGND VNB VPB VPWR X
-M1000 a_81_268# C a_363_394# VPB pshort w=840000u l=180000u
-+  ad=3.9275e+11p pd=2.79e+06u as=5.184e+11p ps=4.63e+06u
-M1001 a_786_100# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.0267e+12p ps=7.95e+06u
-M1002 a_786_100# B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=1.212e+12p ps=9e+06u
-M1003 VGND a_81_268# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1004 a_1116_383# B a_371_74# VNB nlowvt w=640000u l=150000u
-+  ad=4.096e+11p pd=3.95e+06u as=4.48e+11p ps=3.96e+06u
-M1005 a_1116_383# a_897_54# VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_363_394# a_232_162# a_81_268# VNB nlowvt w=640000u l=150000u
-+  ad=4.271e+11p pd=3.96e+06u as=2.24e+11p ps=1.98e+06u
-M1007 a_371_74# a_786_100# a_897_54# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=5.95425e+11p ps=4.74e+06u
-M1008 a_81_268# C a_371_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_363_394# a_786_100# a_897_54# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=6.9725e+11p ps=5.56e+06u
-M1010 a_1116_383# B a_363_394# VPB pshort w=640000u l=180000u
-+  ad=4.578e+11p pd=4.39e+06u as=0p ps=0u
-M1011 a_1116_383# a_897_54# VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_371_74# a_786_100# a_1116_383# VPB pshort w=640000u l=180000u
-+  ad=5.792e+11p pd=4.82e+06u as=0p ps=0u
-M1013 a_232_162# C VGND VNB nlowvt w=420000u l=150000u
-+  ad=1.575e+11p pd=1.59e+06u as=0p ps=0u
-M1014 a_897_54# B a_363_394# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_897_54# B a_371_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_81_268# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.024e+11p ps=2.78e+06u
-M1017 VGND A a_897_54# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_232_162# C VPWR VPB pshort w=640000u l=180000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1019 a_371_74# a_232_162# a_81_268# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A a_897_54# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_363_394# a_786_100# a_1116_383# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND C a_232_162# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X1 a_81_268# a_232_162# a_363_394# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X2 a_897_54# a_786_100# a_363_394# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 VGND a_897_54# a_1116_383# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_371_74# C a_81_268# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 a_897_54# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_1116_383# a_786_100# a_371_74# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X7 X a_81_268# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 VGND B a_786_100# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_1116_383# a_786_100# a_363_394# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 VPWR C a_232_162# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X11 a_371_74# B a_897_54# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X12 a_363_394# B a_897_54# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 a_897_54# a_786_100# a_371_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 a_81_268# a_232_162# a_371_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X15 VPWR a_897_54# a_1116_383# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X16 X a_81_268# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X17 VPWR B a_786_100# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 a_363_394# B a_1116_383# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X19 a_897_54# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X20 a_363_394# C a_81_268# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X21 a_371_74# B a_1116_383# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/xnor3/sky130_fd_sc_ms__xnor3_2.cdl b/cells/xnor3/sky130_fd_sc_ms__xnor3_2.cdl
index 72e04a1..8d964db 100644
--- a/cells/xnor3/sky130_fd_sc_ms__xnor3_2.cdl
+++ b/cells/xnor3/sky130_fd_sc_ms__xnor3_2.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ms__xnor3_2 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN3 X net69 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X net69 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI29 Ab Bb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 Abb Bb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 Bb B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 Ab Bb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 mid1 Cb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 Ab A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 Cb C VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI2 mid2 C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 Abb Ab VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 Ab B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 mid1 Cb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI28 Abb B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 X net69 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI650 mid1 C VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI27 mid2 B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI47 Abb Ab VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI23 mid1 B VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI26 mid2 Bb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 mid2 Cb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X net69 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI33 Cb C VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 C VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI45 Ab A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI16 Bb B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 mid1 B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 mid2 Cb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 mid1 Bb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI19 mid1 Bb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__xnor3_2
diff --git a/cells/xnor3/sky130_fd_sc_ms__xnor3_2.netlist.tsv b/cells/xnor3/sky130_fd_sc_ms__xnor3_2.netlist.tsv
index 4b21bda..68a9c2f 100644
--- a/cells/xnor3/sky130_fd_sc_ms__xnor3_2.netlist.tsv
+++ b/cells/xnor3/sky130_fd_sc_ms__xnor3_2.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ms__xnor3_2	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN3	MOSFET	X	net69	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	Ab	Bb	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Abb	Bb	mid1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	mid1	Cb	net69	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	Cb	C	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	mid2	C	net69	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Ab	B	mid1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	Abb	B	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	net69	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	C	net69	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	mid2	Cb	net69	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net69	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	Ab	Bb	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Abb	Bb	mid1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	mid1	Cb	net69	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	Cb	C	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	mid2	C	net69	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Ab	B	mid1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	Abb	B	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	net69	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	mid1	C	net69	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	mid2	B	Ab	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	mid1	B	Abb	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	mid2	Bb	Abb	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	mid2	Cb	net69	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	Cb	C	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	mid1	Bb	Ab	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor3/sky130_fd_sc_ms__xnor3_2.spice b/cells/xnor3/sky130_fd_sc_ms__xnor3_2.spice
index 063c648..a89a50e 100644
--- a/cells/xnor3/sky130_fd_sc_ms__xnor3_2.spice
+++ b/cells/xnor3/sky130_fd_sc_ms__xnor3_2.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__xnor3_2 A B C VGND VNB VPB VPWR X
-M1000 a_335_373# B a_83_247# VPB pshort w=840000u l=180000u
-+  ad=5.572e+11p pd=4.77e+06u as=7.096e+11p ps=5.58e+06u
-M1001 a_83_247# a_397_21# a_329_81# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=5.174e+11p ps=4.63e+06u
-M1002 a_83_247# a_397_21# a_335_373# VNB nlowvt w=640000u l=150000u
-+  ad=5.925e+11p pd=4.86e+06u as=4.512e+11p ps=3.97e+06u
-M1003 a_335_373# B a_27_373# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.886e+11p ps=3.85e+06u
-M1004 a_27_373# a_397_21# a_329_81# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=4.22e+11p ps=4.25e+06u
-M1005 a_1057_74# a_1027_48# a_335_373# VPB pshort w=840000u l=180000u
-+  ad=4.0245e+11p pd=2.81e+06u as=0p ps=0u
-M1006 X a_1057_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=1.5438e+12p ps=1.187e+07u
-M1007 a_329_81# C a_1057_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_1057_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_1057_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=1.54235e+12p ps=1.041e+07u
-M1010 a_83_247# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_373# a_397_21# a_335_373# VPB pshort w=640000u l=180000u
-+  ad=4.656e+11p pd=4.42e+06u as=0p ps=0u
-M1012 VGND a_83_247# a_27_373# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND C a_1027_48# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1014 a_329_81# B a_27_373# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_83_247# a_27_373# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND B a_397_21# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1017 VGND a_1057_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_329_81# B a_83_247# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_335_373# C a_1057_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.24e+11p ps=1.98e+06u
-M1020 VPWR C a_1027_48# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.76e+11p ps=1.83e+06u
-M1021 VPWR B a_397_21# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.08e+11p ps=2.79e+06u
-M1022 a_83_247# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1057_74# a_1027_48# a_329_81# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_1057_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 a_335_373# a_1027_48# a_1057_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 a_1057_74# C a_329_81# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 VGND A a_83_247# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_329_81# a_397_21# a_27_373# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X5 a_335_373# a_397_21# a_27_373# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X6 a_83_247# B a_329_81# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X7 a_1057_74# C a_335_373# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 a_329_81# a_397_21# a_83_247# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X9 VPWR A a_83_247# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X10 a_397_21# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 X a_1057_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X12 a_329_81# a_1027_48# a_1057_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 a_27_373# a_83_247# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 a_27_373# B a_335_373# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 a_397_21# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_335_373# a_397_21# a_83_247# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 a_1027_48# C VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X18 VGND a_1057_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 a_1027_48# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X20 a_27_373# a_83_247# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X21 VPWR a_1057_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_27_373# B a_329_81# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X23 a_83_247# B a_335_373# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
 .ends
diff --git a/cells/xnor3/sky130_fd_sc_ms__xnor3_4.cdl b/cells/xnor3/sky130_fd_sc_ms__xnor3_4.cdl
index 337dfb6..8a5cbb3 100644
--- a/cells/xnor3/sky130_fd_sc_ms__xnor3_4.cdl
+++ b/cells/xnor3/sky130_fd_sc_ms__xnor3_4.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ms__xnor3_4 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN3 X net69 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X net69 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI29 Ab Bb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 Abb Bb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 Bb B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 Ab Bb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 mid1 Cb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 Ab A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 Cb C VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI2 mid2 C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 Abb Ab VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 Ab B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 mid1 Cb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI28 Abb B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 X net69 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI650 mid1 C VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI27 mid2 B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI47 Abb Ab VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI23 mid1 B VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI26 mid2 Bb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 mid2 Cb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X net69 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI33 Cb C VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 C VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI45 Ab A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI16 Bb B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 mid1 B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 mid2 Cb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 mid1 Bb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI19 mid1 Bb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ms__xnor3_4
diff --git a/cells/xnor3/sky130_fd_sc_ms__xnor3_4.netlist.tsv b/cells/xnor3/sky130_fd_sc_ms__xnor3_4.netlist.tsv
index 4269190..8a7f3d5 100644
--- a/cells/xnor3/sky130_fd_sc_ms__xnor3_4.netlist.tsv
+++ b/cells/xnor3/sky130_fd_sc_ms__xnor3_4.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ms__xnor3_4	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN3	MOSFET	X	net69	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	Ab	Bb	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Abb	Bb	mid1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	mid1	Cb	net69	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	Cb	C	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	mid2	C	net69	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Ab	B	mid1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	Abb	B	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	net69	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	C	net69	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	mid2	Cb	net69	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net69	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	Ab	Bb	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Abb	Bb	mid1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	mid1	Cb	net69	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	Cb	C	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	mid2	C	net69	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Ab	B	mid1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	Abb	B	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	net69	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	mid1	C	net69	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	mid2	B	Ab	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	mid1	B	Abb	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	mid2	Bb	Abb	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	mid2	Cb	net69	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	Cb	C	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	mid1	Bb	Ab	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor3/sky130_fd_sc_ms__xnor3_4.spice b/cells/xnor3/sky130_fd_sc_ms__xnor3_4.spice
index 3e69fa3..84af111 100644
--- a/cells/xnor3/sky130_fd_sc_ms__xnor3_4.spice
+++ b/cells/xnor3/sky130_fd_sc_ms__xnor3_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__xnor3_4 A B C VGND VNB VPB VPWR X
-M1000 a_75_227# a_386_23# a_321_77# VPB pshort w=840000u l=180000u
-+  ad=7.2195e+11p pd=5.6e+06u as=4.964e+11p ps=4.58e+06u
-M1001 X a_1057_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=2.35215e+12p ps=1.359e+07u
-M1002 X a_1057_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=2.2864e+12p ps=1.53e+07u
-M1003 a_75_227# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=5.611e+11p pd=4.74e+06u as=0p ps=0u
-M1004 X a_1057_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_327_373# B a_27_373# VNB nlowvt w=640000u l=150000u
-+  ad=3.84e+11p pd=3.76e+06u as=4.635e+11p ps=4.06e+06u
-M1006 a_27_373# a_386_23# a_321_77# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.739e+11p ps=3.78e+06u
-M1007 VPWR B a_386_23# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1008 VPWR a_1057_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_75_227# a_386_23# a_327_373# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_327_373# C a_1057_74# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.592e+11p ps=2.09e+06u
-M1011 VGND a_1057_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR C a_1024_300# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1013 VGND a_1057_74# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_373# a_386_23# a_327_373# VPB pshort w=640000u l=180000u
-+  ad=4.528e+11p pd=4.38e+06u as=6.18e+11p ps=4.96e+06u
-M1015 a_321_77# B a_27_373# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_75_227# a_27_373# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND C a_1024_300# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1018 a_75_227# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_321_77# C a_1057_74# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=4.305e+11p ps=2.98e+06u
-M1020 VPWR a_75_227# a_27_373# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1057_74# a_1024_300# a_327_373# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND B a_386_23# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1023 X a_1057_74# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_321_77# B a_75_227# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_327_373# B a_75_227# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_1057_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1057_74# a_1024_300# a_321_77# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_1057_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_327_373# a_1024_300# a_1057_74# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 a_321_77# a_386_23# a_27_373# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X3 X a_1057_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_1057_74# C a_327_373# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 VGND a_1057_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR A a_75_227# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_321_77# a_386_23# a_75_227# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X8 VGND A a_75_227# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X9 VGND a_1057_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X10 a_27_373# B a_321_77# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X11 a_1024_300# C VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X12 X a_1057_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 a_75_227# B a_321_77# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X14 a_27_373# a_75_227# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 a_321_77# a_1024_300# a_1057_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X16 a_75_227# B a_327_373# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X17 a_327_373# a_386_23# a_75_227# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X18 X a_1057_74# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_27_373# B a_327_373# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X20 X a_1057_74# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 a_386_23# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X22 a_386_23# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_327_373# a_386_23# a_27_373# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X24 a_1024_300# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X25 a_27_373# a_75_227# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X26 a_1057_74# C a_321_77# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X27 VPWR a_1057_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
 .ends
diff --git a/cells/xor2/sky130_fd_sc_ms__xor2_1.cdl b/cells/xor2/sky130_fd_sc_ms__xor2_1.cdl
index 5aa2b78..c60e8cd 100644
--- a/cells/xor2/sky130_fd_sc_ms__xor2_1.cdl
+++ b/cells/xor2/sky130_fd_sc_ms__xor2_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__xor2_1 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNnor0 inor A VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNnor0 inor A VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnor1 inor B VNB nfet_01v8_lvt m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 VGND A VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 sndNA B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 X inor VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor B VNB nlowvt m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND A VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNA B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 X inor VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid A VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 X inor VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid A VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 X inor VPB pfet_01v8 m=1 w=1.12 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_ms__xor2_1
diff --git a/cells/xor2/sky130_fd_sc_ms__xor2_1.netlist.tsv b/cells/xor2/sky130_fd_sc_ms__xor2_1.netlist.tsv
index 0da5e00..c1bcaea 100644
--- a/cells/xor2/sky130_fd_sc_ms__xor2_1.netlist.tsv
+++ b/cells/xor2/sky130_fd_sc_ms__xor2_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__xor2_1	A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNnor0	MOSFET	inor	A	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	B	VGND	VNB	nlowvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNA	B	X	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	X	inor	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA	B	inor	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	A	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	X	inor	pmid	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	B	VGND	VNB	nfet_01v8_lvt	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNA	B	X	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	X	inor	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA	B	inor	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	A	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	X	inor	pmid	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor2/sky130_fd_sc_ms__xor2_1.spice b/cells/xor2/sky130_fd_sc_ms__xor2_1.spice
index 21fa27f..e42f150 100644
--- a/cells/xor2/sky130_fd_sc_ms__xor2_1.spice
+++ b/cells/xor2/sky130_fd_sc_ms__xor2_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ms__xor2_1 A B VGND VNB VPB VPWR X
-M1000 a_161_392# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=7.168e+11p ps=5.58e+06u
-M1001 a_194_125# B a_161_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1002 VGND B a_194_125# VNB nlowvt w=550000u l=150000u
-+  ad=8.846e+11p pd=6.8e+06u as=3.5475e+11p ps=2.39e+06u
-M1003 VPWR A a_355_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=7.168e+11p ps=5.76e+06u
-M1004 a_455_87# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1005 X B a_455_87# VNB nlowvt w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=0p ps=0u
-M1006 a_355_368# B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_194_125# a_355_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=3.696e+11p pd=2.9e+06u as=0p ps=0u
-M1008 a_194_125# A VGND VNB nlowvt w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_194_125# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_194_125# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X1 VGND A a_194_125# VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X2 VPWR B a_355_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_355_368# a_194_125# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 a_194_125# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=550000u l=150000u
+X5 a_355_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_455_87# B X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 VPWR A a_161_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X8 VGND A a_455_87# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_161_392# B a_194_125# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/xor2/sky130_fd_sc_ms__xor2_2.cdl b/cells/xor2/sky130_fd_sc_ms__xor2_2.cdl
index 2d5f33e..f2173b2 100644
--- a/cells/xor2/sky130_fd_sc_ms__xor2_2.cdl
+++ b/cells/xor2/sky130_fd_sc_ms__xor2_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__xor2_2 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNnor0 inor A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNnor0 inor A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnor1 inor B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 VGND A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 sndNA B VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 X inor VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND A VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNA B VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 X inor VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA B VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid A VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 X inor VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA B VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid A VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 X inor VPB pfet_01v8 m=2 w=1.12 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_ms__xor2_2
diff --git a/cells/xor2/sky130_fd_sc_ms__xor2_2.netlist.tsv b/cells/xor2/sky130_fd_sc_ms__xor2_2.netlist.tsv
index 3d312de..30a05b8 100644
--- a/cells/xor2/sky130_fd_sc_ms__xor2_2.netlist.tsv
+++ b/cells/xor2/sky130_fd_sc_ms__xor2_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__xor2_2	A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNnor0	MOSFET	inor	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	B	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNA	B	X	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	X	inor	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A	sndPA	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA	B	inor	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	A	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	X	inor	pmid	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	B	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNA	B	X	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	X	inor	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA	B	inor	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	A	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	X	inor	pmid	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor2/sky130_fd_sc_ms__xor2_2.spice b/cells/xor2/sky130_fd_sc_ms__xor2_2.spice
index fa20b8e..92a4cf6 100644
--- a/cells/xor2/sky130_fd_sc_ms__xor2_2.spice
+++ b/cells/xor2/sky130_fd_sc_ms__xor2_2.spice
@@ -16,34 +16,19 @@
 
 
 .subckt sky130_fd_sc_ms__xor2_2 A B VGND VNB VPB VPWR X
-M1000 a_313_368# a_183_74# X VPB pshort w=1.12e+06u l=180000u
-+  ad=1.2432e+12p pd=1.118e+07u as=3.024e+11p ps=2.78e+06u
-M1001 a_119_392# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=2.4e+11p pd=2.48e+06u as=9.968e+11p ps=8.32e+06u
-M1002 VPWR B a_313_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_313_368# B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND B a_183_74# VNB nlowvt w=640000u l=150000u
-+  ad=1.4793e+12p pd=8.78e+06u as=1.792e+11p ps=1.84e+06u
-M1005 a_183_74# B a_119_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1006 X B a_399_74# VNB nlowvt w=740000u l=150000u
-+  ad=4.181e+11p pd=4.09e+06u as=5.66e+11p ps=4.61e+06u
-M1007 a_399_74# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_183_74# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_399_74# B X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A a_399_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_183_74# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A a_313_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_313_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_183_74# a_313_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_313_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_119_392# B a_183_74# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X2 X a_183_74# a_313_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X3 a_313_368# a_183_74# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X4 VGND A a_399_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_313_368# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X6 a_183_74# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X7 X B a_399_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X8 a_399_74# B X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VGND A a_183_74# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_313_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 a_399_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 VGND a_183_74# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 VPWR B a_313_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X14 VPWR A a_119_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
 .ends
diff --git a/cells/xor2/sky130_fd_sc_ms__xor2_4.cdl b/cells/xor2/sky130_fd_sc_ms__xor2_4.cdl
index 752628a..dcc0ac0 100644
--- a/cells/xor2/sky130_fd_sc_ms__xor2_4.cdl
+++ b/cells/xor2/sky130_fd_sc_ms__xor2_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ms__xor2_4 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNnor0 inor A VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNnor0 inor A VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnor1 inor B VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 VGND A VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 sndNA B VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 X inor VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor B VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND A VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNA B VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 X inor VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA B VPB pshort m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid A VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 X inor VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA B VPB pfet_01v8 m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid A VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 X inor VPB pfet_01v8 m=4 w=1.12 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_ms__xor2_4
diff --git a/cells/xor2/sky130_fd_sc_ms__xor2_4.netlist.tsv b/cells/xor2/sky130_fd_sc_ms__xor2_4.netlist.tsv
index a435cfc..9cd2636 100644
--- a/cells/xor2/sky130_fd_sc_ms__xor2_4.netlist.tsv
+++ b/cells/xor2/sky130_fd_sc_ms__xor2_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ms__xor2_4	A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNnor0	MOSFET	inor	A	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	B	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNA	B	X	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	X	inor	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A	sndPA	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA	B	inor	VPB	pshort	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	A	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	X	inor	pmid	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	B	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNA	B	X	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	X	inor	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA	B	inor	VPB	pfet_01v8	2	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	A	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	X	inor	pmid	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor2/sky130_fd_sc_ms__xor2_4.spice b/cells/xor2/sky130_fd_sc_ms__xor2_4.spice
index 2d3d174..bc344e9 100644
--- a/cells/xor2/sky130_fd_sc_ms__xor2_4.spice
+++ b/cells/xor2/sky130_fd_sc_ms__xor2_4.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_ms__xor2_4 A B VGND VNB VPB VPWR X
-M1000 VPWR B a_514_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=1.95185e+12p pd=1.524e+07u as=2.1112e+12p ps=1.945e+07u
-M1001 a_160_98# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=4.958e+11p pd=4.3e+06u as=2.40945e+12p ps=1.687e+07u
-M1002 a_514_368# B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_514_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_36_392# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=8.1e+11p pd=7.62e+06u as=0p ps=0u
-M1005 VPWR B a_514_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_514_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_160_98# B a_36_392# VPB pshort w=1e+06u l=180000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1008 a_514_368# B VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A a_36_392# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X B a_877_74# VNB nlowvt w=740000u l=150000u
-+  ad=8.325e+11p pd=6.69e+06u as=1.0952e+12p ps=1.036e+07u
-M1011 a_36_392# B a_160_98# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_877_74# B X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_160_98# a_514_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1014 VGND a_160_98# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A a_877_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_877_74# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_514_368# a_160_98# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_160_98# a_514_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_514_368# a_160_98# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_877_74# B X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A a_514_368# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A a_160_98# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_160_98# B VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X B a_877_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_877_74# A VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_514_368# A VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A a_877_74# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND B a_160_98# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 X a_160_98# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_36_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X1 VPWR A a_514_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_160_98# B a_36_392# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X3 a_877_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 X a_160_98# a_514_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X5 a_877_74# B X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VPWR B a_514_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X7 X a_160_98# a_514_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X8 VGND A a_877_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VPWR A a_514_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X10 VPWR B a_514_368# VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X11 VGND A a_877_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X12 X B a_877_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X13 X B a_877_74# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_877_74# B X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X15 a_160_98# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X16 a_36_392# B a_160_98# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X17 a_514_368# a_160_98# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 a_514_368# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 VGND A a_160_98# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X20 VGND B a_160_98# VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X21 a_514_368# a_160_98# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_514_368# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X23 a_877_74# A VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 a_36_392# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X25 a_514_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X26 a_160_98# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X27 X a_160_98# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X28 a_514_368# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X29 VGND a_160_98# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
 .ends
diff --git a/cells/xor3/sky130_fd_sc_ms__xor3_1.cdl b/cells/xor3/sky130_fd_sc_ms__xor3_1.cdl
index b2741ca..d44cc06 100644
--- a/cells/xor3/sky130_fd_sc_ms__xor3_1.cdl
+++ b/cells/xor3/sky130_fd_sc_ms__xor3_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ms__xor3_1 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP3 X net97 VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X net97 VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 Cb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 mid1 Cb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 mid2 C VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI1 mid2 C VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI33 Cb C VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI45 Ab A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 mid1 Bb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI47 Abb Ab VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI19 mid1 Bb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 mid1 B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI16 Bb B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI23 mid1 B VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI26 mid2 Bb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X net97 VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI27 mid2 B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X net97 VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 Cb C VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 mid1 C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 mid1 C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 mid2 Cb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 Ab A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 Cb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 Abb Ab VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 Bb B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 Ab B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 Ab Bb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 Abb Bb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 Abb B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI29 Ab Bb VNB nfet_01v8_lvt m=1 w=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_ms__xor3_1
diff --git a/cells/xor3/sky130_fd_sc_ms__xor3_1.netlist.tsv b/cells/xor3/sky130_fd_sc_ms__xor3_1.netlist.tsv
index 18dd0c2..dff469d 100644
--- a/cells/xor3/sky130_fd_sc_ms__xor3_1.netlist.tsv
+++ b/cells/xor3/sky130_fd_sc_ms__xor3_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ms__xor3_1	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP3	MOSFET	X	net97	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	Cb	net97	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	mid2	C	net97	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	net97	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	Cb	C	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	mid1	C	net97	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	mid2	Cb	net97	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Ab	B	mid1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Abb	Bb	mid1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	Abb	B	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	Ab	Bb	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	net97	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	mid1	Cb	net97	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	mid2	C	net97	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	Cb	C	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	mid1	Bb	Ab	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	mid1	B	Abb	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	mid2	Bb	Abb	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	mid2	B	Ab	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net97	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	Cb	C	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	mid1	C	net97	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	mid2	Cb	net97	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Ab	B	mid1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Abb	Bb	mid1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	Abb	B	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	Ab	Bb	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor3/sky130_fd_sc_ms__xor3_1.spice b/cells/xor3/sky130_fd_sc_ms__xor3_1.spice
index 3be3da0..e74079a 100644
--- a/cells/xor3/sky130_fd_sc_ms__xor3_1.spice
+++ b/cells/xor3/sky130_fd_sc_ms__xor3_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ms__xor3_1 A B C VGND VNB VPB VPWR X
-M1000 a_84_108# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=6.252e+11p pd=4.99e+06u as=1.3258e+12p ps=8.35e+06u
-M1001 a_1218_396# a_1157_298# a_416_86# VPB pshort w=840000u l=180000u
-+  ad=4.83e+11p pd=2.83e+06u as=5.8575e+11p ps=4.8e+06u
-M1002 a_84_108# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=8.354e+11p pd=5.57e+06u as=1.2444e+12p ps=9e+06u
-M1003 a_387_392# C a_1218_396# VPB pshort w=840000u l=180000u
-+  ad=5.436e+11p pd=4.69e+06u as=0p ps=0u
-M1004 X a_1218_396# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1005 VPWR a_84_108# a_27_134# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=4.656e+11p ps=4.42e+06u
-M1006 a_27_134# a_452_288# a_416_86# VNB nlowvt w=420000u l=150000u
-+  ad=4.987e+11p pd=4.17e+06u as=4.475e+11p ps=4.01e+06u
-M1007 a_416_86# C a_1218_396# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.392e+11p ps=2.34e+06u
-M1008 a_27_134# a_452_288# a_387_392# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_416_86# B a_27_134# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_84_108# a_452_288# a_416_86# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B a_452_288# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.035e+11p ps=2.03e+06u
-M1012 a_387_392# B a_84_108# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR C a_1157_298# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=2.432e+11p ps=2.04e+06u
-M1014 a_387_392# B a_27_134# VNB nlowvt w=640000u l=150000u
-+  ad=5.1415e+11p pd=4.38e+06u as=0p ps=0u
-M1015 a_416_86# B a_84_108# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1218_396# a_1157_298# a_387_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND C a_1157_298# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1018 X a_1218_396# VGND VNB nlowvt w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1019 VGND a_84_108# a_27_134# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_84_108# a_452_288# a_387_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR B a_452_288# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
+X0 a_387_392# a_452_288# a_27_134# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X1 VPWR a_1218_396# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X2 a_416_86# a_452_288# a_84_108# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X3 a_27_134# B a_387_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X4 a_452_288# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X5 a_416_86# a_452_288# a_27_134# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X6 a_27_134# a_84_108# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X7 a_84_108# B a_416_86# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X8 VGND a_1218_396# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 VGND A a_84_108# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_387_392# a_1157_298# a_1218_396# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X11 a_387_392# a_452_288# a_84_108# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 a_1157_298# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X13 VPWR A a_84_108# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X14 a_27_134# a_84_108# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X15 a_1218_396# C a_416_86# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X16 a_1157_298# C VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X17 a_27_134# B a_416_86# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X18 a_452_288# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_1218_396# C a_387_392# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X20 a_84_108# B a_387_392# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X21 a_416_86# a_1157_298# a_1218_396# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
 .ends
diff --git a/cells/xor3/sky130_fd_sc_ms__xor3_2.cdl b/cells/xor3/sky130_fd_sc_ms__xor3_2.cdl
index 72892e4..ba6e2fe 100644
--- a/cells/xor3/sky130_fd_sc_ms__xor3_2.cdl
+++ b/cells/xor3/sky130_fd_sc_ms__xor3_2.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ms__xor3_2 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP3 X net97 VPB pshort m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X net97 VPB pfet_01v8 m=2 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 Cb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 mid1 Cb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 mid2 C VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI1 mid2 C VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI33 Cb C VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI45 Ab A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 mid1 Bb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI47 Abb Ab VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI19 mid1 Bb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 mid1 B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI16 Bb B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI23 mid1 B VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI26 mid2 Bb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X net97 VNB nlowvt m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI27 mid2 B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X net97 VNB nfet_01v8_lvt m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 Cb C VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 mid1 C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 mid1 C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 mid2 Cb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 Ab A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 Cb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 Abb Ab VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 Bb B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 Ab B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 Ab Bb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 Abb Bb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 Abb B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI29 Ab Bb VNB nfet_01v8_lvt m=1 w=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_ms__xor3_2
diff --git a/cells/xor3/sky130_fd_sc_ms__xor3_2.netlist.tsv b/cells/xor3/sky130_fd_sc_ms__xor3_2.netlist.tsv
index f979382..0620cb7 100644
--- a/cells/xor3/sky130_fd_sc_ms__xor3_2.netlist.tsv
+++ b/cells/xor3/sky130_fd_sc_ms__xor3_2.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ms__xor3_2	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP3	MOSFET	X	net97	VPWR	VPB	pshort	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	Cb	net97	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	mid2	C	net97	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	net97	VGND	VNB	nlowvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	Cb	C	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	mid1	C	net97	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	mid2	Cb	net97	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Ab	B	mid1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Abb	Bb	mid1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	Abb	B	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	Ab	Bb	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	net97	VPWR	VPB	pfet_01v8	2	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	mid1	Cb	net97	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	mid2	C	net97	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	Cb	C	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	mid1	Bb	Ab	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	mid1	B	Abb	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	mid2	Bb	Abb	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	mid2	B	Ab	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net97	VGND	VNB	nfet_01v8_lvt	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	Cb	C	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	mid1	C	net97	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	mid2	Cb	net97	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Ab	B	mid1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Abb	Bb	mid1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	Abb	B	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	Ab	Bb	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor3/sky130_fd_sc_ms__xor3_2.spice b/cells/xor3/sky130_fd_sc_ms__xor3_2.spice
index 2707514..e3aa17e 100644
--- a/cells/xor3/sky130_fd_sc_ms__xor3_2.spice
+++ b/cells/xor3/sky130_fd_sc_ms__xor3_2.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ms__xor3_2 A B C VGND VNB VPB VPWR X
-M1000 a_83_289# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=6.24525e+11p pd=4.72e+06u as=1.66725e+12p ps=1.089e+07u
-M1001 a_27_134# a_440_315# a_375_419# VPB pshort w=640000u l=180000u
-+  ad=4.528e+11p pd=4.38e+06u as=4.932e+11p ps=4.57e+06u
-M1002 VGND a_1198_424# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1003 a_416_113# B a_27_134# VPB pshort w=640000u l=180000u
-+  ad=5.184e+11p pd=4.63e+06u as=0p ps=0u
-M1004 X a_1198_424# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=3.024e+11p pd=2.78e+06u as=1.807e+12p ps=1.21e+07u
-M1005 a_1198_424# a_1162_379# a_375_419# VNB nlowvt w=640000u l=150000u
-+  ad=3.3955e+11p pd=2.48e+06u as=4.75e+11p ps=4.11e+06u
-M1006 VPWR a_83_289# a_27_134# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_1198_424# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_83_289# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=8.848e+11p pd=5.68e+06u as=0p ps=0u
-M1009 a_416_113# C a_1198_424# VNB nlowvt w=640000u l=150000u
-+  ad=4.219e+11p pd=3.93e+06u as=0p ps=0u
-M1010 a_27_134# a_440_315# a_416_113# VNB nlowvt w=420000u l=150000u
-+  ad=4.987e+11p pd=4.17e+06u as=0p ps=0u
-M1011 VGND B a_440_315# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.035e+11p ps=2.03e+06u
-M1012 a_375_419# C a_1198_424# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=4.872e+11p ps=2.84e+06u
-M1013 a_83_289# a_440_315# a_416_113# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_1198_424# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1198_424# a_1162_379# a_416_113# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR C a_1162_379# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=2.304e+11p ps=2e+06u
-M1017 a_375_419# B a_27_134# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_83_289# a_27_134# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND C a_1162_379# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1020 a_416_113# B a_83_289# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_83_289# a_440_315# a_375_419# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR B a_440_315# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1023 a_375_419# B a_83_289# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_1198_424# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X1 a_416_113# a_440_315# a_83_289# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 a_83_289# B a_416_113# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_1162_379# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X4 a_27_134# a_83_289# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X5 a_440_315# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X6 VGND a_1198_424# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X7 a_416_113# a_1162_379# a_1198_424# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X8 a_1162_379# C VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X9 a_416_113# a_440_315# a_27_134# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X10 a_83_289# B a_375_419# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X11 VGND A a_83_289# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 a_27_134# B a_416_113# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X13 X a_1198_424# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 VPWR a_1198_424# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X15 a_375_419# a_440_315# a_83_289# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X16 a_27_134# a_83_289# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X17 a_1198_424# C a_416_113# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X18 a_440_315# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X19 a_27_134# B a_375_419# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X20 a_375_419# a_440_315# a_27_134# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X21 a_1198_424# C a_375_419# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X22 VPWR A a_83_289# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X23 a_375_419# a_1162_379# a_1198_424# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
 .ends
diff --git a/cells/xor3/sky130_fd_sc_ms__xor3_4.cdl b/cells/xor3/sky130_fd_sc_ms__xor3_4.cdl
index 7563ae8..3c9126c 100644
--- a/cells/xor3/sky130_fd_sc_ms__xor3_4.cdl
+++ b/cells/xor3/sky130_fd_sc_ms__xor3_4.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ms__xor3_4 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP3 X net97 VPB pshort m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X net97 VPB pfet_01v8 m=4 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 Cb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI650 mid1 Cb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 mid2 C VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI1 mid2 C VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI33 Cb C VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB pshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI45 Ab A VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 mid1 Bb VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI47 Abb Ab VPB pfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB pshort m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
+MI19 mid1 Bb VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 mid1 B VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI16 Bb B VPB pfet_01v8 m=1 w=1.12 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB pshort m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
+MI23 mid1 B VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB pshort m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
+MI26 mid2 Bb VPB pfet_01v8 m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X net97 VNB nlowvt m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI27 mid2 B VPB pfet_01v8 m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X net97 VNB nfet_01v8_lvt m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 Cb C VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 mid1 C VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 mid1 C VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 mid2 Cb VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 Ab A VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 Cb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 Abb Ab VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 Bb B VNB nfet_01v8_lvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 Ab B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nlowvt m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB nlowvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 Ab Bb VNB nlowvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 Abb Bb VNB nfet_01v8_lvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 Abb B VNB nfet_01v8_lvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI29 Ab Bb VNB nfet_01v8_lvt m=1 w=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_ms__xor3_4
diff --git a/cells/xor3/sky130_fd_sc_ms__xor3_4.netlist.tsv b/cells/xor3/sky130_fd_sc_ms__xor3_4.netlist.tsv
index e34f4e2..65a3f65 100644
--- a/cells/xor3/sky130_fd_sc_ms__xor3_4.netlist.tsv
+++ b/cells/xor3/sky130_fd_sc_ms__xor3_4.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ms__xor3_4	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP3	MOSFET	X	net97	VPWR	VPB	pshort	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	Cb	net97	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	mid2	C	net97	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	pshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	pshort	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	pshort	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	pshort	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	net97	VGND	VNB	nlowvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	Cb	C	VGND	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	mid1	C	net97	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	mid2	Cb	net97	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	VGND	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nlowvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Ab	B	mid1	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Abb	Bb	mid1	VNB	nlowvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	Abb	B	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	Ab	Bb	mid2	VNB	nlowvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	net97	VPWR	VPB	pfet_01v8	4	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	mid1	Cb	net97	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	mid2	C	net97	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	Cb	C	VPWR	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	Ab	A	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	mid1	Bb	Ab	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8	1	1.12	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	mid1	B	Abb	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	mid2	Bb	Abb	VPB	pfet_01v8	1	0.64	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	mid2	B	Ab	VPB	pfet_01v8	1	0.84	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net97	VGND	VNB	nfet_01v8_lvt	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	Cb	C	VGND	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	mid1	C	net97	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	mid2	Cb	net97	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8_lvt	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Ab	B	mid1	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Abb	Bb	mid1	VNB	nfet_01v8_lvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	Abb	B	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	Ab	Bb	mid2	VNB	nfet_01v8_lvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor3/sky130_fd_sc_ms__xor3_4.spice b/cells/xor3/sky130_fd_sc_ms__xor3_4.spice
index bebf5f6..9016ded 100644
--- a/cells/xor3/sky130_fd_sc_ms__xor3_4.spice
+++ b/cells/xor3/sky130_fd_sc_ms__xor3_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ms__xor3_4 A B C VGND VNB VPB VPWR X
-M1000 VPWR C a_1155_284# VPB pshort w=640000u l=180000u
-+  ad=2.1152e+12p pd=1.487e+07u as=1.792e+11p ps=1.84e+06u
-M1001 VGND C a_1155_284# VNB nlowvt w=420000u l=150000u
-+  ad=1.6131e+12p pd=1.223e+07u as=2.121e+11p ps=1.85e+06u
-M1002 VPWR a_74_294# a_27_118# VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=5.6055e+11p ps=4.93e+06u
-M1003 a_1221_388# a_1155_284# a_416_118# VPB pshort w=840000u l=180000u
-+  ad=4.2e+11p pd=2.68e+06u as=6.5265e+11p ps=4.95e+06u
-M1004 VGND a_1221_388# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1005 VGND a_74_294# a_27_118# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=4.264e+11p ps=4.03e+06u
-M1006 a_326_392# B a_27_118# VNB nlowvt w=640000u l=150000u
-+  ad=4.6775e+11p pd=4.06e+06u as=0p ps=0u
-M1007 a_326_392# C a_1221_388# VPB pshort w=840000u l=180000u
-+  ad=5.184e+11p pd=4.63e+06u as=0p ps=0u
-M1008 a_1221_388# a_1155_284# a_326_392# VNB nlowvt w=640000u l=150000u
-+  ad=3.392e+11p pd=2.34e+06u as=0p ps=0u
-M1009 a_326_392# B a_74_294# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=8.764e+11p ps=5.66e+06u
-M1010 X a_1221_388# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_1221_388# VGND VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_1221_388# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=6.048e+11p pd=5.56e+06u as=0p ps=0u
-M1013 a_416_118# B a_74_294# VNB nlowvt w=640000u l=150000u
-+  ad=3.899e+11p pd=3.83e+06u as=7.264e+11p ps=4.83e+06u
-M1014 a_74_294# a_397_320# a_416_118# VPB pshort w=840000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR B a_397_320# VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1016 a_416_118# C a_1221_388# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_1221_388# VPWR VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_118# a_397_320# a_416_118# VNB nlowvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_118# a_397_320# a_326_392# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_1221_388# X VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_416_118# B a_27_118# VPB pshort w=640000u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_1221_388# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_74_294# A VGND VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND B a_397_320# VNB nlowvt w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1025 a_74_294# A VPWR VPB pshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_1221_388# X VPB pshort w=1.12e+06u l=180000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_74_294# a_397_320# a_326_392# VNB nlowvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1221_388# C a_416_118# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X1 a_416_118# a_397_320# a_74_294# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X2 a_74_294# B a_416_118# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X3 a_397_320# B VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X4 a_326_392# a_1155_284# a_1221_388# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X5 VPWR A a_74_294# VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X6 a_1155_284# C VGND VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X7 a_27_118# B a_416_118# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X8 X a_1221_388# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X9 a_27_118# a_74_294# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X10 a_326_392# a_397_320# a_27_118# VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
+X11 a_326_392# a_397_320# a_74_294# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X12 VGND A a_74_294# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X13 X a_1221_388# VGND VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X14 a_416_118# a_1155_284# a_1221_388# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X15 a_27_118# B a_326_392# VNB sky130_fd_pr__nfet_01v8_lvt w=640000u l=150000u
+X16 a_74_294# B a_326_392# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X17 VPWR a_1221_388# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X18 VGND a_1221_388# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X19 X a_1221_388# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X20 a_1221_388# C a_326_392# VPB sky130_fd_pr__pfet_01v8 w=840000u l=180000u
+X21 VPWR a_1221_388# X VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X22 a_416_118# a_397_320# a_27_118# VNB sky130_fd_pr__nfet_01v8_lvt w=420000u l=150000u
+X23 VGND a_1221_388# X VNB sky130_fd_pr__nfet_01v8_lvt w=740000u l=150000u
+X24 X a_1221_388# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X25 a_27_118# a_74_294# VPWR VPB sky130_fd_pr__pfet_01v8 w=1e+06u l=180000u
+X26 a_397_320# B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.12e+06u l=180000u
+X27 a_1155_284# C VPWR VPB sky130_fd_pr__pfet_01v8 w=640000u l=180000u
 .ends