diff --git a/cells/esd_rf_nfet_20v0_hbm/sky130_fd_pr__esd_rf_nfet_20v0_hbm_21vW60p00.spice b/cells/esd_rf_nfet_20v0_hbm/sky130_fd_pr__esd_rf_nfet_20v0_hbm_21vW60p00.spice
index 2fdaa52..2d04d13 100644
--- a/cells/esd_rf_nfet_20v0_hbm/sky130_fd_pr__esd_rf_nfet_20v0_hbm_21vW60p00.spice
+++ b/cells/esd_rf_nfet_20v0_hbm/sky130_fd_pr__esd_rf_nfet_20v0_hbm_21vW60p00.spice
@@ -16,6 +16,6 @@
 
 
 * Top level circuit sky130_fd_pr__esd_rf_nfet_20v0_hbm_21vW60p00
-X0 dw_n700_n714# SUBS SUBS SUBS sky130_fd_pr__nfet_20v0 w=1.5e+07u l=1.65e+07u
-X1 dw_n700_n714# SUBS SUBS SUBS sky130_fd_pr__nfet_20v0 w=1.5e+07u l=1.65e+07u
+X0 dw_n700_n714# SUBS SUBS SUBS sky130_fd_pr__nfet_20v0 w=3e+07u l=1.5e+06u
+X1 dw_n700_n714# SUBS SUBS SUBS sky130_fd_pr__nfet_20v0 w=3e+07u l=1.5e+06u
 .end
diff --git a/cells/esd_rf_nfet_20v0_hbm/sky130_fd_pr__esd_rf_nfet_20v0_hbm_32vW60p00.spice b/cells/esd_rf_nfet_20v0_hbm/sky130_fd_pr__esd_rf_nfet_20v0_hbm_32vW60p00.spice
index 49e785e..2933bd3 100644
--- a/cells/esd_rf_nfet_20v0_hbm/sky130_fd_pr__esd_rf_nfet_20v0_hbm_32vW60p00.spice
+++ b/cells/esd_rf_nfet_20v0_hbm/sky130_fd_pr__esd_rf_nfet_20v0_hbm_32vW60p00.spice
@@ -16,6 +16,6 @@
 
 
 * Top level circuit sky130_fd_pr__esd_rf_nfet_20v0_hbm_32vW60p00
-X0 dw_n700_n714# SUBS SUBS SUBS sky130_fd_pr__nfet_20v0 w=1.5e+07u l=1.65e+07u
-X1 dw_n700_n714# SUBS SUBS SUBS sky130_fd_pr__nfet_20v0 w=1.5e+07u l=1.65e+07u
+X0 dw_n700_n714# SUBS SUBS SUBS sky130_fd_pr__nfet_20v0 w=3e+07u l=1.5e+06u
+X1 dw_n700_n714# SUBS SUBS SUBS sky130_fd_pr__nfet_20v0 w=3e+07u l=1.5e+06u
 .end
diff --git a/cells/esd_rf_nfet_20v0_iec/sky130_fd_pr__esd_rf_nfet_20v0_iec_21vW60p00.spice b/cells/esd_rf_nfet_20v0_iec/sky130_fd_pr__esd_rf_nfet_20v0_iec_21vW60p00.spice
index 9f0a289..2d11f01 100644
--- a/cells/esd_rf_nfet_20v0_iec/sky130_fd_pr__esd_rf_nfet_20v0_iec_21vW60p00.spice
+++ b/cells/esd_rf_nfet_20v0_iec/sky130_fd_pr__esd_rf_nfet_20v0_iec_21vW60p00.spice
@@ -16,6 +16,6 @@
 
 
 * Top level circuit sky130_fd_pr__esd_rf_nfet_20v0_iec_21vW60p00
-X0 dw_n700_n714# SUBS SUBS SUBS sky130_fd_pr__nfet_20v0 w=1.5e+07u l=1.65e+07u
-X1 dw_n700_n714# SUBS SUBS SUBS sky130_fd_pr__nfet_20v0 w=1.5e+07u l=1.65e+07u
+X0 dw_n700_n714# SUBS SUBS SUBS sky130_fd_pr__nfet_20v0 w=3e+07u l=1.5e+06u
+X1 dw_n700_n714# SUBS SUBS SUBS sky130_fd_pr__nfet_20v0 w=3e+07u l=1.5e+06u
 .end
diff --git a/cells/esd_rf_nfet_20v0_iec/sky130_fd_pr__esd_rf_nfet_20v0_iec_32vW60p00.spice b/cells/esd_rf_nfet_20v0_iec/sky130_fd_pr__esd_rf_nfet_20v0_iec_32vW60p00.spice
index 60df9ba..58fbf7a 100644
--- a/cells/esd_rf_nfet_20v0_iec/sky130_fd_pr__esd_rf_nfet_20v0_iec_32vW60p00.spice
+++ b/cells/esd_rf_nfet_20v0_iec/sky130_fd_pr__esd_rf_nfet_20v0_iec_32vW60p00.spice
@@ -16,6 +16,6 @@
 
 
 * Top level circuit sky130_fd_pr__esd_rf_nfet_20v0_iec_32vW60p00
-X0 dw_n700_n714# SUBS SUBS SUBS sky130_fd_pr__nfet_20v0 w=1.5e+07u l=1.65e+07u
-X1 dw_n700_n714# SUBS SUBS SUBS sky130_fd_pr__nfet_20v0 w=1.5e+07u l=1.65e+07u
+X0 dw_n700_n714# SUBS SUBS SUBS sky130_fd_pr__nfet_20v0 w=3e+07u l=1.5e+06u
+X1 dw_n700_n714# SUBS SUBS SUBS sky130_fd_pr__nfet_20v0 w=3e+07u l=1.5e+06u
 .end
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W1p65L0p15.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W1p65L0p15.cdl
index 9fbf0db..209d1f5 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W1p65L0p15.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W1p65L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_aM02W1p65L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
 .ENDS sky130_fd_pr__nfet_01v8_aM02W1p65L0p15
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W1p65L0p18.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W1p65L0p18.cdl
index 1305db8..4597749 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W1p65L0p18.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W1p65L0p18.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_aM02W1p65L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
 .ENDS sky130_fd_pr__nfet_01v8_aM02W1p65L0p18
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W1p65L0p25.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W1p65L0p25.cdl
index 30f76b7..75bffce 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W1p65L0p25.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W1p65L0p25.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_aM02W1p65L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
 .ENDS sky130_fd_pr__nfet_01v8_aM02W1p65L0p25
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W3p00L0p15.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W3p00L0p15.cdl
index 0fda7cc..3cf8d3c 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W3p00L0p15.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W3p00L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_aM02W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__nfet_01v8_aM02W3p00L0p15
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W3p00L0p18.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W3p00L0p18.cdl
index 6d91d29..fefc12e 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W3p00L0p18.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W3p00L0p18.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_aM02W3p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
 .ENDS sky130_fd_pr__nfet_01v8_aM02W3p00L0p18
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W3p00L0p25.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W3p00L0p25.cdl
index ad6fbae..a3018a5 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W3p00L0p25.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W3p00L0p25.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_aM02W3p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
 .ENDS sky130_fd_pr__nfet_01v8_aM02W3p00L0p25
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W5p00L0p15.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W5p00L0p15.cdl
index c7aab03..eea29c5 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W5p00L0p15.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W5p00L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_aM02W5p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__nfet_01v8_aM02W5p00L0p15
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W5p00L0p18.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W5p00L0p18.cdl
index acc04a1..5ed8f6f 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W5p00L0p18.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W5p00L0p18.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_aM02W5p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
 .ENDS sky130_fd_pr__nfet_01v8_aM02W5p00L0p18
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W5p00L0p25.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W5p00L0p25.cdl
index da83dbd..8b4d754 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W5p00L0p25.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM02W5p00L0p25.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_aM02W5p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
 .ENDS sky130_fd_pr__nfet_01v8_aM02W5p00L0p25
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W1p65L0p15.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W1p65L0p15.cdl
index 6de0b6b..01030aa 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W1p65L0p15.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W1p65L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_aM04W1p65L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
 .ENDS sky130_fd_pr__nfet_01v8_aM04W1p65L0p15
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W1p65L0p18.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W1p65L0p18.cdl
index a76dc34..6b60f93 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W1p65L0p18.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W1p65L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_aM04W1p65L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
 .ENDS sky130_fd_pr__nfet_01v8_aM04W1p65L0p18
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W1p65L0p25.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W1p65L0p25.cdl
index dda7bd4..c0f7dc2 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W1p65L0p25.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W1p65L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_aM04W1p65L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
 .ENDS sky130_fd_pr__nfet_01v8_aM04W1p65L0p25
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W3p00L0p15.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W3p00L0p15.cdl
index 257986b..0fe7eb0 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W3p00L0p15.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W3p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_aM04W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__nfet_01v8_aM04W3p00L0p15
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W3p00L0p18.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W3p00L0p18.cdl
index 1cbe792..0fda259 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W3p00L0p18.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W3p00L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_aM04W3p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
 .ENDS sky130_fd_pr__nfet_01v8_aM04W3p00L0p18
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W3p00L0p25.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W3p00L0p25.cdl
index d6b28be..e3fd42b 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W3p00L0p25.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W3p00L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_aM04W3p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
 .ENDS sky130_fd_pr__nfet_01v8_aM04W3p00L0p25
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W5p00L0p15.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W5p00L0p15.cdl
index ab6b81a..4f2ae4f 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W5p00L0p15.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W5p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_aM04W5p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__nfet_01v8_aM04W5p00L0p15
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W5p00L0p18.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W5p00L0p18.cdl
index c2154d0..f288e95 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W5p00L0p18.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W5p00L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_aM04W5p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
 .ENDS sky130_fd_pr__nfet_01v8_aM04W5p00L0p18
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W5p00L0p25.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W5p00L0p25.cdl
index f0a0317..dfe6b69 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W5p00L0p25.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_aM04W5p00L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_aM04W5p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
 .ENDS sky130_fd_pr__nfet_01v8_aM04W5p00L0p25
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_hcM04W3p00L0p15.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_hcM04W3p00L0p15.cdl
index 19562c4..43601f0 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_hcM04W3p00L0p15.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_hcM04W3p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_hcM04W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__nfet_01v8_hcM04W3p00L0p15
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_hcM04W5p00L0p15.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_hcM04W5p00L0p15.cdl
index 3ffb7b6..1d4b55b 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_hcM04W5p00L0p15.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_hcM04W5p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_hcM04W5p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__nfet_01v8_hcM04W5p00L0p15
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_mcM04W3p00L0p15.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_mcM04W3p00L0p15.cdl
index 4c0bbd4..66529fd 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_mcM04W3p00L0p15.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_mcM04W3p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_mcM04W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__nfet_01v8_mcM04W3p00L0p15
diff --git a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_mcM04W5p00L0p15.cdl b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_mcM04W5p00L0p15.cdl
index 476aeb0..c24942c 100644
--- a/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_mcM04W5p00L0p15.cdl
+++ b/cells/nfet_01v8/sky130_fd_pr__nfet_01v8_mcM04W5p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_mcM04W5p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__nfet_01v8_mcM04W5p00L0p15
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W1p65L0p15.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W1p65L0p15.cdl
index 4d9e56a..ef9e4b2 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W1p65L0p15.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W1p65L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_aM02W1p65L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_aM02W1p65L0p15
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W1p65L0p18.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W1p65L0p18.cdl
index c721e82..4a39ff4 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W1p65L0p18.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W1p65L0p18.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_aM02W1p65L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_aM02W1p65L0p18
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W1p65L0p25.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W1p65L0p25.cdl
index a57be3e..1e067dd 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W1p65L0p25.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W1p65L0p25.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_aM02W1p65L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_aM02W1p65L0p25
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W3p00L0p15.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W3p00L0p15.cdl
index bc64bf5..352a5cb 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W3p00L0p15.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W3p00L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_aM02W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_aM02W3p00L0p15
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W3p00L0p18.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W3p00L0p18.cdl
index 253fb8c..252c465 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W3p00L0p18.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W3p00L0p18.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_aM02W3p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_aM02W3p00L0p18
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W3p00L0p25.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W3p00L0p25.cdl
index 4aeeb49..4684783 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W3p00L0p25.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W3p00L0p25.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_aM02W3p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_aM02W3p00L0p25
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W5p00L0p15.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W5p00L0p15.cdl
index f52ccdc..00e19bc 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W5p00L0p15.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W5p00L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_aM02W5p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_aM02W5p00L0p15
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W5p00L0p18.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W5p00L0p18.cdl
index 82a2ed8..767718c 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W5p00L0p18.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W5p00L0p18.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_aM02W5p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_aM02W5p00L0p18
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W5p00L0p25.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W5p00L0p25.cdl
index 8e54078..5bc7f7e 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W5p00L0p25.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM02W5p00L0p25.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_aM02W5p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_aM02W5p00L0p25
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W1p65L0p15.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W1p65L0p15.cdl
index b1e2204..005935a 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W1p65L0p15.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W1p65L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_aM04W1p65L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_aM04W1p65L0p15
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W1p65L0p18.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W1p65L0p18.cdl
index 19bff9b..6d72b2e 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W1p65L0p18.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W1p65L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_aM04W1p65L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_aM04W1p65L0p18
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W1p65L0p25.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W1p65L0p25.cdl
index 8c662ff..2ea356f 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W1p65L0p25.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W1p65L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_aM04W1p65L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_aM04W1p65L0p25
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W3p00L0p15.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W3p00L0p15.cdl
index f75a4c0..d0f1e3b 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W3p00L0p15.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W3p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_aM04W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_aM04W3p00L0p15
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W3p00L0p18.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W3p00L0p18.cdl
index 4e56af7..c5efd2d 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W3p00L0p18.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W3p00L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_aM04W3p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_aM04W3p00L0p18
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W3p00L0p25.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W3p00L0p25.cdl
index 4a21fdd..a1a780e 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W3p00L0p25.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W3p00L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_aM04W3p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_aM04W3p00L0p25
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W5p00L0p15.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W5p00L0p15.cdl
index bc00365..cb511df 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W5p00L0p15.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W5p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_aM04W5p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_aM04W5p00L0p15
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W5p00L0p18.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W5p00L0p18.cdl
index 2e99e93..d5777b5 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W5p00L0p18.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W5p00L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_aM04W5p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_aM04W5p00L0p18
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W5p00L0p25.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W5p00L0p25.cdl
index 9cdd954..f22158f 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W5p00L0p25.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_aM04W5p00L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_aM04W5p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_aM04W5p00L0p25
diff --git a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_bM02W1p65L0p15.cdl b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_bM02W1p65L0p15.cdl
index 4f9ee06..6677584 100644
--- a/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_bM02W1p65L0p15.cdl
+++ b/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt_bM02W1p65L0p15.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__nfet_01v8_lvt_bM02W1p65L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
 .ENDS sky130_fd_pr__nfet_01v8_lvt_bM02W1p65L0p15
diff --git a/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM04W3p00L0p50.cdl b/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM04W3p00L0p50.cdl
index df332df..269d1f5 100644
--- a/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM04W3p00L0p50.cdl
+++ b/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM04W3p00L0p50.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_g5v0d10v5_aM04W3p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
 .ENDS sky130_fd_pr__nfet_g5v0d10v5_aM04W3p00L0p50
diff --git a/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM04W5p00L0p50.cdl b/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM04W5p00L0p50.cdl
index 7189e06..706560e 100644
--- a/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM04W5p00L0p50.cdl
+++ b/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM04W5p00L0p50.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_g5v0d10v5_aM04W5p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
 .ENDS sky130_fd_pr__nfet_g5v0d10v5_aM04W5p00L0p50
diff --git a/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM04W7p00L0p50.cdl b/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM04W7p00L0p50.cdl
index 0d0d71e..74568c3 100644
--- a/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM04W7p00L0p50.cdl
+++ b/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM04W7p00L0p50.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__nfet_g5v0d10v5_aM04W7p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
 .ENDS sky130_fd_pr__nfet_g5v0d10v5_aM04W7p00L0p50
diff --git a/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM10W3p00L0p50.cdl b/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM10W3p00L0p50.cdl
index e4a0dd5..7746481 100644
--- a/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM10W3p00L0p50.cdl
+++ b/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM10W3p00L0p50.cdl
@@ -16,14 +16,14 @@
 
 .SUBCKT sky130_fd_pr__nfet_g5v0d10v5_aM10W3p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M5 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M6 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M7 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M8 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M9 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M10 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M5 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M6 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M7 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M8 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M9 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M10 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
 .ENDS sky130_fd_pr__nfet_g5v0d10v5_aM10W3p00L0p50
diff --git a/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM10W5p00L0p50.cdl b/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM10W5p00L0p50.cdl
index 8ea665e..b50d340 100644
--- a/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM10W5p00L0p50.cdl
+++ b/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM10W5p00L0p50.cdl
@@ -16,14 +16,14 @@
 
 .SUBCKT sky130_fd_pr__nfet_g5v0d10v5_aM10W5p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M5 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M6 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M7 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M8 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M9 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M10 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M5 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M6 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M7 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M8 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M9 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M10 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
 .ENDS sky130_fd_pr__nfet_g5v0d10v5_aM10W5p00L0p50
diff --git a/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM10W7p00L0p50.cdl b/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM10W7p00L0p50.cdl
index 67b9f78..bf5e6e5 100644
--- a/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM10W7p00L0p50.cdl
+++ b/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5_aM10W7p00L0p50.cdl
@@ -16,14 +16,14 @@
 
 .SUBCKT sky130_fd_pr__nfet_g5v0d10v5_aM10W7p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M5 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M6 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M7 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M8 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M9 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M10 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M5 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M6 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M7 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M8 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M9 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M10 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
 .ENDS sky130_fd_pr__nfet_g5v0d10v5_aM10W7p00L0p50
diff --git a/cells/npn_11v0/sky130_fd_pr__npn_11v0_W1p00L1p00.spice b/cells/npn_11v0/sky130_fd_pr__npn_11v0_W1p00L1p00.spice
index 94e75c7..35c799d 100644
--- a/cells/npn_11v0/sky130_fd_pr__npn_11v0_W1p00L1p00.spice
+++ b/cells/npn_11v0/sky130_fd_pr__npn_11v0_W1p00L1p00.spice
@@ -16,5 +16,5 @@
 
 
 .subckt sky130_fd_pr__npn_11v0_W1p00L1p00 B C E
-X0 C E E SUBS sky130_fd_pr__nfet_20v0 w=3e+06u l=3.52e+06u
+X0 C E E SUBS sky130_fd_pr__nfet_20v0 w=5.95e+06u l=130000u
 .ends
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W1p65L0p15.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W1p65L0p15.cdl
index 7d485ab..934246a 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W1p65L0p15.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W1p65L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_aM02W1p65L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.15 m=1
 .ENDS sky130_fd_pr__pfet_01v8_aM02W1p65L0p15
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W1p65L0p18.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W1p65L0p18.cdl
index 2543297..8e90816 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W1p65L0p18.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W1p65L0p18.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_aM02W1p65L0p18 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.65 l=0.18 m=1
-M2 DRAIN GATE BULK model_use_only w=1.65 l=0.18 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.18 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.18 m=1
 .ENDS sky130_fd_pr__pfet_01v8_aM02W1p65L0p18
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W1p65L0p25.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W1p65L0p25.cdl
index 658c214..f2ed891 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W1p65L0p25.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W1p65L0p25.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_aM02W1p65L0p25 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.65 l=0.25 m=1
-M2 DRAIN GATE BULK model_use_only w=1.65 l=0.25 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.25 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.25 m=1
 .ENDS sky130_fd_pr__pfet_01v8_aM02W1p65L0p25
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W3p00L0p15.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W3p00L0p15.cdl
index 107b7bf..5410f03 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W3p00L0p15.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W3p00L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_aM02W3p00L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__pfet_01v8_aM02W3p00L0p15
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W3p00L0p18.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W3p00L0p18.cdl
index 9dc31fc..8ca984d 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W3p00L0p18.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W3p00L0p18.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_aM02W3p00L0p18 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.18 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.18 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.18 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.18 m=1
 .ENDS sky130_fd_pr__pfet_01v8_aM02W3p00L0p18
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W3p00L0p25.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W3p00L0p25.cdl
index 032776e..44e8eab 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W3p00L0p25.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W3p00L0p25.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_aM02W3p00L0p25 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.25 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.25 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.25 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.25 m=1
 .ENDS sky130_fd_pr__pfet_01v8_aM02W3p00L0p25
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W5p00L0p15.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W5p00L0p15.cdl
index a6ebaaa..31bbfee 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W5p00L0p15.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W5p00L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_aM02W5p00L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__pfet_01v8_aM02W5p00L0p15
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W5p00L0p18.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W5p00L0p18.cdl
index 87ebdfb..379bec9 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W5p00L0p18.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W5p00L0p18.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_aM02W5p00L0p18 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.18 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.18 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.18 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.18 m=1
 .ENDS sky130_fd_pr__pfet_01v8_aM02W5p00L0p18
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W5p00L0p25.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W5p00L0p25.cdl
index 5ccd76f..569c567 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W5p00L0p25.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM02W5p00L0p25.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_aM02W5p00L0p25 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.25 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.25 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.25 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.25 m=1
 .ENDS sky130_fd_pr__pfet_01v8_aM02W5p00L0p25
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W1p65L0p15.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W1p65L0p15.cdl
index 77660ff..3e01354 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W1p65L0p15.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W1p65L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_aM04W1p65L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=1.65 l=0.15 m=1
-M3 DRAIN GATE BULK model_use_only w=1.65 l=0.15 m=1
-M4 DRAIN GATE BULK model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.15 m=1
 .ENDS sky130_fd_pr__pfet_01v8_aM04W1p65L0p15
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W1p65L0p18.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W1p65L0p18.cdl
index 9cf5991..afaec5f 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W1p65L0p18.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W1p65L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_aM04W1p65L0p18 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.65 l=0.18 m=1
-M2 DRAIN GATE BULK model_use_only w=1.65 l=0.18 m=1
-M3 DRAIN GATE BULK model_use_only w=1.65 l=0.18 m=1
-M4 DRAIN GATE BULK model_use_only w=1.65 l=0.18 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.18 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.18 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.18 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.18 m=1
 .ENDS sky130_fd_pr__pfet_01v8_aM04W1p65L0p18
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W1p65L0p25.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W1p65L0p25.cdl
index 43cc353..f10ca26 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W1p65L0p25.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W1p65L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_aM04W1p65L0p25 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.65 l=0.25 m=1
-M2 DRAIN GATE BULK model_use_only w=1.65 l=0.25 m=1
-M3 DRAIN GATE BULK model_use_only w=1.65 l=0.25 m=1
-M4 DRAIN GATE BULK model_use_only w=1.65 l=0.25 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.25 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.25 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.25 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.25 m=1
 .ENDS sky130_fd_pr__pfet_01v8_aM04W1p65L0p25
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W3p00L0p15.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W3p00L0p15.cdl
index d06cb03..1b6d4bb 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W3p00L0p15.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W3p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_aM04W3p00L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M3 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M4 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__pfet_01v8_aM04W3p00L0p15
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W3p00L0p18.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W3p00L0p18.cdl
index ce7ddd2..098d23d 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W3p00L0p18.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W3p00L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_aM04W3p00L0p18 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.18 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.18 m=1
-M3 DRAIN GATE BULK model_use_only w=3.01 l=0.18 m=1
-M4 DRAIN GATE BULK model_use_only w=3.01 l=0.18 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.18 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.18 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.18 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.18 m=1
 .ENDS sky130_fd_pr__pfet_01v8_aM04W3p00L0p18
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W3p00L0p25.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W3p00L0p25.cdl
index 7288570..d0e4683 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W3p00L0p25.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W3p00L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_aM04W3p00L0p25 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.25 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.25 m=1
-M3 DRAIN GATE BULK model_use_only w=3.01 l=0.25 m=1
-M4 DRAIN GATE BULK model_use_only w=3.01 l=0.25 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.25 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.25 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.25 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.25 m=1
 .ENDS sky130_fd_pr__pfet_01v8_aM04W3p00L0p25
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W5p00L0p15.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W5p00L0p15.cdl
index ab3a8eb..cdbb6d0 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W5p00L0p15.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W5p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_aM04W5p00L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M3 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M4 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__pfet_01v8_aM04W5p00L0p15
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W5p00L0p18.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W5p00L0p18.cdl
index 5108913..89d5e8c 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W5p00L0p18.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W5p00L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_aM04W5p00L0p18 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.18 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.18 m=1
-M3 DRAIN GATE BULK model_use_only w=5.05 l=0.18 m=1
-M4 DRAIN GATE BULK model_use_only w=5.05 l=0.18 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.18 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.18 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.18 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.18 m=1
 .ENDS sky130_fd_pr__pfet_01v8_aM04W5p00L0p18
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W5p00L0p25.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W5p00L0p25.cdl
index 4420db7..b37acb1 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W5p00L0p25.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_aM04W5p00L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_aM04W5p00L0p25 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.25 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.25 m=1
-M3 DRAIN GATE BULK model_use_only w=5.05 l=0.25 m=1
-M4 DRAIN GATE BULK model_use_only w=5.05 l=0.25 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.25 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.25 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.25 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.25 m=1
 .ENDS sky130_fd_pr__pfet_01v8_aM04W5p00L0p25
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_hcM04W3p00L0p15.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_hcM04W3p00L0p15.cdl
index ee5f48a..3c99cb2 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_hcM04W3p00L0p15.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_hcM04W3p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_hcM04W3p00L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M3 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M4 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__pfet_01v8_hcM04W3p00L0p15
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_hcM04W5p00L0p15.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_hcM04W5p00L0p15.cdl
index bcb3f15..a89bd67 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_hcM04W5p00L0p15.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_hcM04W5p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_hcM04W5p00L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M3 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M4 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__pfet_01v8_hcM04W5p00L0p15
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_mcM04W3p00L0p15.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_mcM04W3p00L0p15.cdl
index d2f6ddd..3ad8e05 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_mcM04W3p00L0p15.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_mcM04W3p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_mcM04W3p00L0p15 DRAIN GATE SOURCE BULK
 *.PININFO DRAIN:? GATE:? SOURCE:? BULK:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M3 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M4 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__pfet_01v8_mcM04W3p00L0p15
diff --git a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_mcM04W5p00L0p15.cdl b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_mcM04W5p00L0p15.cdl
index fbff58f..9cb1ed0 100644
--- a/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_mcM04W5p00L0p15.cdl
+++ b/cells/pfet_01v8/sky130_fd_pr__pfet_01v8_mcM04W5p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_mcM04W5p00L0p15 DRAIN GATE SOURCE BULK
 *.PININFO DRAIN:? GATE:? SOURCE:? BULK:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M3 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M4 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__pfet_01v8_mcM04W5p00L0p15
diff --git a/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM02W3p00L0p35.cdl b/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM02W3p00L0p35.cdl
index 6b28c8b..43c6093 100644
--- a/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM02W3p00L0p35.cdl
+++ b/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM02W3p00L0p35.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_lvt_aM02W3p00L0p35 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.35 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.35 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.35 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.35 m=1
 .ENDS sky130_fd_pr__pfet_01v8_lvt_aM02W3p00L0p35
diff --git a/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM02W3p00L0p50.cdl b/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM02W3p00L0p50.cdl
index da04961..4a7f321 100644
--- a/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM02W3p00L0p50.cdl
+++ b/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM02W3p00L0p50.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_lvt_aM02W3p00L0p50 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.5 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.5 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.5 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.5 m=1
 .ENDS sky130_fd_pr__pfet_01v8_lvt_aM02W3p00L0p50
diff --git a/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM02W5p00L0p35.cdl b/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM02W5p00L0p35.cdl
index a578a8d..e13a950 100644
--- a/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM02W5p00L0p35.cdl
+++ b/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM02W5p00L0p35.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_lvt_aM02W5p00L0p35 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.35 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.35 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.35 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.35 m=1
 .ENDS sky130_fd_pr__pfet_01v8_lvt_aM02W5p00L0p35
diff --git a/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM02W5p00L0p50.cdl b/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM02W5p00L0p50.cdl
index d730ca3..159ade5 100644
--- a/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM02W5p00L0p50.cdl
+++ b/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM02W5p00L0p50.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_lvt_aM02W5p00L0p50 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.5 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.5 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.5 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.5 m=1
 .ENDS sky130_fd_pr__pfet_01v8_lvt_aM02W5p00L0p50
diff --git a/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM04W3p00L0p35.cdl b/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM04W3p00L0p35.cdl
index 25c145b..8589405 100644
--- a/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM04W3p00L0p35.cdl
+++ b/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM04W3p00L0p35.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_lvt_aM04W3p00L0p35 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.35 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.35 m=1
-M3 DRAIN GATE BULK model_use_only w=3.01 l=0.35 m=1
-M4 DRAIN GATE BULK model_use_only w=3.01 l=0.35 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.35 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.35 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.35 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.35 m=1
 .ENDS sky130_fd_pr__pfet_01v8_lvt_aM04W3p00L0p35
diff --git a/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM04W3p00L0p50.cdl b/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM04W3p00L0p50.cdl
index 94cba9e..cf4ab29 100644
--- a/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM04W3p00L0p50.cdl
+++ b/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM04W3p00L0p50.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_lvt_aM04W3p00L0p50 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.5 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.5 m=1
-M3 DRAIN GATE BULK model_use_only w=3.01 l=0.5 m=1
-M4 DRAIN GATE BULK model_use_only w=3.01 l=0.5 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.5 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.5 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.5 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.5 m=1
 .ENDS sky130_fd_pr__pfet_01v8_lvt_aM04W3p00L0p50
diff --git a/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM04W5p00L0p35.cdl b/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM04W5p00L0p35.cdl
index 2e9ce2f..60be6ab 100644
--- a/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM04W5p00L0p35.cdl
+++ b/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM04W5p00L0p35.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_lvt_aM04W5p00L0p35 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.35 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.35 m=1
-M3 DRAIN GATE BULK model_use_only w=5.05 l=0.35 m=1
-M4 DRAIN GATE BULK model_use_only w=5.05 l=0.35 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.35 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.35 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.35 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.35 m=1
 .ENDS sky130_fd_pr__pfet_01v8_lvt_aM04W5p00L0p35
diff --git a/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM04W5p00L0p50.cdl b/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM04W5p00L0p50.cdl
index 3162aaa..0e5a46c 100644
--- a/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM04W5p00L0p50.cdl
+++ b/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt_aM04W5p00L0p50.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__pfet_01v8_lvt_aM04W5p00L0p50 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.5 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.5 m=1
-M3 DRAIN GATE BULK model_use_only w=5.05 l=0.5 m=1
-M4 DRAIN GATE BULK model_use_only w=5.05 l=0.5 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.5 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.5 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.5 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.5 m=1
 .ENDS sky130_fd_pr__pfet_01v8_lvt_aM04W5p00L0p50
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p15.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p15.cdl
index 15cfec3..36a6726 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p15.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p15
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p18.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p18.cdl
index 3228fb8..5eff87c 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p18.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p18.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p18
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p25.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p25.cdl
index 492f1f5..3829e39 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p25.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p25.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p25
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W3p00L0p15.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W3p00L0p15.cdl
index e4f093e..c655d31 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W3p00L0p15.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W3p00L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_aM02W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_aM02W3p00L0p15
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W3p00L0p18.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W3p00L0p18.cdl
index e4afa18..ae82d4c 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W3p00L0p18.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W3p00L0p18.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_aM02W3p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_aM02W3p00L0p18
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W3p00L0p25.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W3p00L0p25.cdl
index 0d17e0d..b7ec237 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W3p00L0p25.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W3p00L0p25.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_aM02W3p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_aM02W3p00L0p25
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W5p00L0p15.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W5p00L0p15.cdl
index eb998f6..3bf2db3 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W5p00L0p15.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W5p00L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_aM02W5p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_aM02W5p00L0p15
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W5p00L0p18.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W5p00L0p18.cdl
index 51b7911..9d26a19 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W5p00L0p18.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W5p00L0p18.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_aM02W5p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_aM02W5p00L0p18
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W5p00L0p25.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W5p00L0p25.cdl
index 125bd1b..fdbdf48 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W5p00L0p25.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM02W5p00L0p25.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_aM02W5p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_aM02W5p00L0p25
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W1p65L0p15.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W1p65L0p15.cdl
index 26bacdd..0d5aa8d 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W1p65L0p15.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W1p65L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_aM04W1p65L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_aM04W1p65L0p15
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W1p65L0p18.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W1p65L0p18.cdl
index f142635..27c961c 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W1p65L0p18.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W1p65L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_aM04W1p65L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_aM04W1p65L0p18
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W1p65L0p25.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W1p65L0p25.cdl
index 44c1d38..207a276 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W1p65L0p25.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W1p65L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_aM04W1p65L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_aM04W1p65L0p25
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W3p00L0p15.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W3p00L0p15.cdl
index 537d7e9..5d2d932 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W3p00L0p15.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W3p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_aM04W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_aM04W3p00L0p15
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W3p00L0p18.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W3p00L0p18.cdl
index 1495619..136638f 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W3p00L0p18.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W3p00L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_aM04W3p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_aM04W3p00L0p18
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W3p00L0p25.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W3p00L0p25.cdl
index 1f0c5f8..9231b59 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W3p00L0p25.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W3p00L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_aM04W3p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_aM04W3p00L0p25
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W5p00L0p15.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W5p00L0p15.cdl
index 5053636..9b7e655 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W5p00L0p15.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W5p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_aM04W5p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_aM04W5p00L0p15
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W5p00L0p18.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W5p00L0p18.cdl
index f04ef82..2a19792 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W5p00L0p18.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W5p00L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_aM04W5p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_aM04W5p00L0p18
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W5p00L0p25.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W5p00L0p25.cdl
index 9922d94..e6b985f 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W5p00L0p25.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_aM04W5p00L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_aM04W5p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_aM04W5p00L0p25
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W1p65L0p15.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W1p65L0p15.cdl
index d3425c2..2939f6b 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W1p65L0p15.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W1p65L0p15.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_bM02W1p65L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_bM02W1p65L0p15
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W1p65L0p18.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W1p65L0p18.cdl
index 0810fea..03f8297 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W1p65L0p18.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W1p65L0p18.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_bM02W1p65L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_bM02W1p65L0p18
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W1p65L0p25.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W1p65L0p25.cdl
index 98e9016..9a7577f 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W1p65L0p25.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W1p65L0p25.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_bM02W1p65L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_bM02W1p65L0p25
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W3p00L0p15.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W3p00L0p15.cdl
index 82f4e84..61d7cc3 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W3p00L0p15.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W3p00L0p15.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_bM02W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_bM02W3p00L0p15
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W3p00L0p18.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W3p00L0p18.cdl
index 1247c64..3460ead 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W3p00L0p18.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W3p00L0p18.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_bM02W3p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_bM02W3p00L0p18
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W3p00L0p25.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W3p00L0p25.cdl
index c436ef9..48fdc2f 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W3p00L0p25.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W3p00L0p25.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_bM02W3p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_bM02W3p00L0p25
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W5p00L0p15.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W5p00L0p15.cdl
index 1f9905f..24fe4af 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W5p00L0p15.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W5p00L0p15.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_bM02W5p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_bM02W5p00L0p15
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W5p00L0p18.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W5p00L0p18.cdl
index c85128c..db7883f 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W5p00L0p18.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W5p00L0p18.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_bM02W5p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_bM02W5p00L0p18
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W5p00L0p25.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W5p00L0p25.cdl
index 42a7d73..5831f44 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W5p00L0p25.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM02W5p00L0p25.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_bM02W5p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_bM02W5p00L0p25
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W1p65L0p15.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W1p65L0p15.cdl
index 27f17c7..e5f4919 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W1p65L0p15.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W1p65L0p15.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_bM04W1p65L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_bM04W1p65L0p15
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W1p65L0p18.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W1p65L0p18.cdl
index b4c8151..476c7b4 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W1p65L0p18.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W1p65L0p18.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_bM04W1p65L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_bM04W1p65L0p18
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W1p65L0p25.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W1p65L0p25.cdl
index c0e37b8..3d96864 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W1p65L0p25.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W1p65L0p25.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_bM04W1p65L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_bM04W1p65L0p25
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W3p00L0p15.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W3p00L0p15.cdl
index 8612f37..6cb9560 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W3p00L0p15.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W3p00L0p15.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_bM04W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_bM04W3p00L0p15
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W3p00L0p18.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W3p00L0p18.cdl
index 369e211..0a501b4 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W3p00L0p18.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W3p00L0p18.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_bM04W3p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_bM04W3p00L0p18
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W3p00L0p25.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W3p00L0p25.cdl
index 2e292ca..c05aa60 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W3p00L0p25.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W3p00L0p25.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_bM04W3p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_bM04W3p00L0p25
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W5p00L0p15.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W5p00L0p15.cdl
index a084f5b..e755fdb 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W5p00L0p15.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W5p00L0p15.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_bM04W5p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_bM04W5p00L0p15
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W5p00L0p18.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W5p00L0p18.cdl
index ccc4911..f8c455f 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W5p00L0p18.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W5p00L0p18.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_bM04W5p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_bM04W5p00L0p18
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W5p00L0p25.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W5p00L0p25.cdl
index 257ddb0..a395e44 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W5p00L0p25.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_bM04W5p00L0p25.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_bM04W5p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_bM04W5p00L0p25
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_hcM04W3p00L0p15.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_hcM04W3p00L0p15.cdl
index 7f620bb..9f3b340 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_hcM04W3p00L0p15.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_hcM04W3p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_hcM04W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_hcM04W3p00L0p15
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_hcM04W5p00L0p15.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_hcM04W5p00L0p15.cdl
index cd20deb..9efa5bc 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_hcM04W5p00L0p15.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_hcM04W5p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_hcM04W5p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_hcM04W5p00L0p15
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_mcM04W3p00L0p15.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_mcM04W3p00L0p15.cdl
index abc0d0c..a1e7e6d 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_mcM04W3p00L0p15.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_mcM04W3p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_mcM04W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_mcM04W3p00L0p15
diff --git a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_mcM04W5p00L0p15.cdl b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_mcM04W5p00L0p15.cdl
index 9d3804b..6493bce 100644
--- a/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_mcM04W5p00L0p15.cdl
+++ b/cells/rf_nfet_01v8/sky130_fd_pr__rf_nfet_01v8_mcM04W5p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_mcM04W5p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_mcM04W5p00L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p42L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p42L0p15.cdl
index 79bcd69..52ab7b0 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p42L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p42L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p42L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=0.42 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=0.42 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=0.42 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=0.42 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p42L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p84L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p84L0p15.cdl
index ededcb3..83a433a 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p84L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p84L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p84L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aF02W0p84L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF02W3p00L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF02W3p00L0p15.cdl
index 152c29d..f13e8d3 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF02W3p00L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF02W3p00L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aF02W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aF02W3p00L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF04W0p84L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF04W0p84L0p15.cdl
index 1512a81..c30090a 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF04W0p84L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF04W0p84L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aF04W0p84L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aF04W0p84L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF04W3p00L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF04W3p00L0p15.cdl
index 43ebf35..53da89b 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF04W3p00L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF04W3p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aF04W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aF04W3p00L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF08W0p84L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF08W0p84L0p15.cdl
index 3b2bf7f..1cbfb3e 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF08W0p84L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF08W0p84L0p15.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aF08W0p84L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
-M5 DRAIN GATE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
-M6 DRAIN GATE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
-M7 DRAIN GATE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
-M8 DRAIN GATE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
+M5 DRAIN GATE SOURCE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
+M6 DRAIN GATE SOURCE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
+M7 DRAIN GATE SOURCE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
+M8 DRAIN GATE SOURCE SUBSTRATE model_use_only w=0.84 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aF08W0p84L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15.cdl
index 869384c..ac14842 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
-M5 DRAIN GATE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
-M6 DRAIN GATE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
-M7 DRAIN GATE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
-M8 DRAIN GATE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
+M5 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
+M6 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
+M7 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
+M8 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.0 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aF08W3p00L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W1p65L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W1p65L0p15.cdl
index b684521..8b7d6df 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W1p65L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W1p65L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aM02W1p65L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aM02W1p65L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W1p65L0p18.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W1p65L0p18.cdl
index e0c836e..3796100 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W1p65L0p18.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W1p65L0p18.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aM02W1p65L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aM02W1p65L0p18
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W1p65L0p25.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W1p65L0p25.cdl
index 9a38a84..357c10e 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W1p65L0p25.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W1p65L0p25.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aM02W1p65L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aM02W1p65L0p25
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W3p00L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W3p00L0p15.cdl
index 3f4e7c0..a9f0bff 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W3p00L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W3p00L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aM02W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aM02W3p00L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W3p00L0p18.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W3p00L0p18.cdl
index 2f25b7f..894d9dd 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W3p00L0p18.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W3p00L0p18.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aM02W3p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aM02W3p00L0p18
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W3p00L0p25.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W3p00L0p25.cdl
index 12e3eef..3a50456 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W3p00L0p25.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W3p00L0p25.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aM02W3p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aM02W3p00L0p25
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W5p00L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W5p00L0p15.cdl
index bfb2fff..ddf9e65 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W5p00L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W5p00L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aM02W5p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aM02W5p00L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W5p00L0p18.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W5p00L0p18.cdl
index 0077382..b775d0b 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W5p00L0p18.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W5p00L0p18.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aM02W5p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aM02W5p00L0p18
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W5p00L0p25.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W5p00L0p25.cdl
index 7d03460..9dfed59 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W5p00L0p25.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM02W5p00L0p25.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aM02W5p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aM02W5p00L0p25
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W1p65L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W1p65L0p15.cdl
index 4f494ac..7eab8e4 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W1p65L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W1p65L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aM04W1p65L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aM04W1p65L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W1p65L0p18.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W1p65L0p18.cdl
index e947ef9..fc9aabc 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W1p65L0p18.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W1p65L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aM04W1p65L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aM04W1p65L0p18
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W1p65L0p25.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W1p65L0p25.cdl
index 7572a04..5a5c580 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W1p65L0p25.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W1p65L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aM04W1p65L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aM04W1p65L0p25
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W3p00L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W3p00L0p15.cdl
index add5077..3c5fe88 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W3p00L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W3p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aM04W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aM04W3p00L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W3p00L0p18.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W3p00L0p18.cdl
index 0531568..64eb937 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W3p00L0p18.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W3p00L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aM04W3p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aM04W3p00L0p18
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W3p00L0p25.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W3p00L0p25.cdl
index 86c8104..04c49b1 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W3p00L0p25.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W3p00L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aM04W3p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aM04W3p00L0p25
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W5p00L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W5p00L0p15.cdl
index 902730c..7c51094 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W5p00L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W5p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aM04W5p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aM04W5p00L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W5p00L0p18.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W5p00L0p18.cdl
index a24ca0f..496440d 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W5p00L0p18.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W5p00L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aM04W5p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aM04W5p00L0p18
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W5p00L0p25.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W5p00L0p25.cdl
index 994b811..2f12156 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W5p00L0p25.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_aM04W5p00L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_aM04W5p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_aM04W5p00L0p25
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W1p65L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W1p65L0p15.cdl
index 8851c3e..6e10a09 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W1p65L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W1p65L0p15.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_bM02W1p65L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_bM02W1p65L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W1p65L0p18.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W1p65L0p18.cdl
index cab48f3..0c3f100 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W1p65L0p18.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W1p65L0p18.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_bM02W1p65L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_bM02W1p65L0p18
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W1p65L0p25.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W1p65L0p25.cdl
index 4196713..59df0c3 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W1p65L0p25.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W1p65L0p25.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_bM02W1p65L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_bM02W1p65L0p25
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W3p00L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W3p00L0p15.cdl
index e908338..ef30f59 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W3p00L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W3p00L0p15.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_bM02W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_bM02W3p00L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W3p00L0p18.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W3p00L0p18.cdl
index 01d4dbb..96fac53 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W3p00L0p18.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W3p00L0p18.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_bM02W3p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_bM02W3p00L0p18
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W3p00L0p25.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W3p00L0p25.cdl
index e0d1a20..053d93a 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W3p00L0p25.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W3p00L0p25.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_bM02W3p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_bM02W3p00L0p25
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W5p00L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W5p00L0p15.cdl
index 2a3bd3a..b6f2b70 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W5p00L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W5p00L0p15.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_bM02W5p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_bM02W5p00L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W5p00L0p18.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W5p00L0p18.cdl
index 8f490db..6423b3e 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W5p00L0p18.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W5p00L0p18.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_bM02W5p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_bM02W5p00L0p18
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W5p00L0p25.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W5p00L0p25.cdl
index 51fca96..0c12da1 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W5p00L0p25.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM02W5p00L0p25.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_bM02W5p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_bM02W5p00L0p25
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W1p65L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W1p65L0p15.cdl
index 9654709..a21f9e3 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W1p65L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W1p65L0p15.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_bM04W1p65L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_bM04W1p65L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W1p65L0p18.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W1p65L0p18.cdl
index ba680a9..91a1e2c 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W1p65L0p18.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W1p65L0p18.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_bM04W1p65L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.18 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_bM04W1p65L0p18
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W1p65L0p25.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W1p65L0p25.cdl
index 21120ec..0a7afdb 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W1p65L0p25.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W1p65L0p25.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_bM04W1p65L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.25 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=1.65 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_bM04W1p65L0p25
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W3p00L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W3p00L0p15.cdl
index 7552978..7e2c409 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W3p00L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W3p00L0p15.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_bM04W3p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_bM04W3p00L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W3p00L0p18.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W3p00L0p18.cdl
index b98fab6..5c4e480 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W3p00L0p18.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W3p00L0p18.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_bM04W3p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.18 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_bM04W3p00L0p18
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W3p00L0p25.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W3p00L0p25.cdl
index 4b7b9ad..23aa3e5 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W3p00L0p25.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W3p00L0p25.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_bM04W3p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.25 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_bM04W3p00L0p25
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W5p00L0p15.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W5p00L0p15.cdl
index 7b2b44d..c17ec63 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W5p00L0p15.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W5p00L0p15.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_bM04W5p00L0p15 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_bM04W5p00L0p15
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W5p00L0p18.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W5p00L0p18.cdl
index 1ce90a9..de4179b 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W5p00L0p18.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W5p00L0p18.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_bM04W5p00L0p18 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.18 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_bM04W5p00L0p18
diff --git a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W5p00L0p25.cdl b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W5p00L0p25.cdl
index 31af9fe..37e75ce 100644
--- a/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W5p00L0p25.cdl
+++ b/cells/rf_nfet_01v8_lvt/sky130_fd_pr__rf_nfet_01v8_lvt_bM04W5p00L0p25.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_01v8_lvt_bM04W5p00L0p25 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.25 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.15
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_01v8_lvt_bM04W5p00L0p25
diff --git a/cells/rf_nfet_20v0_aup/sky130_fd_pr__rf_nfet_20v0_aup.spice b/cells/rf_nfet_20v0_aup/sky130_fd_pr__rf_nfet_20v0_aup.spice
index 300aab8..633525b 100644
--- a/cells/rf_nfet_20v0_aup/sky130_fd_pr__rf_nfet_20v0_aup.spice
+++ b/cells/rf_nfet_20v0_aup/sky130_fd_pr__rf_nfet_20v0_aup.spice
@@ -16,6 +16,6 @@
 
 
 * Top level circuit sky130_fd_pr__rf_nfet_20v0_aup
-X0 dw_n700_n714# a_n900_n1000# a_1050_0# SUBS sky130_fd_pr__nfet_20v0 w=1.5e+07u l=1.65e+07u
-X1 dw_n700_n714# a_n900_n1000# a_n958_0# SUBS sky130_fd_pr__nfet_20v0 w=1.5e+07u l=1.65e+07u
+X0 dw_n700_n714# a_n900_n1000# a_1050_0# SUBS sky130_fd_pr__nfet_20v0 w=3e+07u l=1.5e+06u
+X1 dw_n700_n714# a_n900_n1000# a_n958_0# SUBS sky130_fd_pr__nfet_20v0 w=3e+07u l=1.5e+06u
 .end
diff --git a/cells/rf_nfet_20v0_noptap_iso/sky130_fd_pr__rf_nfet_20v0_noptap_iso.spice b/cells/rf_nfet_20v0_noptap_iso/sky130_fd_pr__rf_nfet_20v0_noptap_iso.spice
index a18d91b..10ecd25 100644
--- a/cells/rf_nfet_20v0_noptap_iso/sky130_fd_pr__rf_nfet_20v0_noptap_iso.spice
+++ b/cells/rf_nfet_20v0_noptap_iso/sky130_fd_pr__rf_nfet_20v0_noptap_iso.spice
@@ -16,6 +16,6 @@
 
 
 * Top level circuit sky130_fd_pr__rf_nfet_20v0_noptap_iso
-X0 dw_n2476_n1400# a_n700_n800# a_1000_0# SUBS sky130_fd_pr__nfet_20v0 w=1.5e+07u l=1.65e+07u
-X1 dw_n2476_n1400# a_n700_n800# a_n826_0# SUBS sky130_fd_pr__nfet_20v0 w=1.5e+07u l=1.65e+07u
+X0 dw_n2476_n1400# a_n700_n800# a_1000_0# SUBS sky130_fd_pr__nfet_20v0 w=3e+07u l=1.5e+06u
+X1 dw_n2476_n1400# a_n700_n800# a_n826_0# SUBS sky130_fd_pr__nfet_20v0 w=3e+07u l=1.5e+06u
 .end
diff --git a/cells/rf_nfet_20v0_nvt_aup/sky130_fd_pr__rf_nfet_20v0_nvt_aup.spice b/cells/rf_nfet_20v0_nvt_aup/sky130_fd_pr__rf_nfet_20v0_nvt_aup.spice
index 248404d..694bf13 100644
--- a/cells/rf_nfet_20v0_nvt_aup/sky130_fd_pr__rf_nfet_20v0_nvt_aup.spice
+++ b/cells/rf_nfet_20v0_nvt_aup/sky130_fd_pr__rf_nfet_20v0_nvt_aup.spice
@@ -16,6 +16,6 @@
 
 
 .subckt sky130_fd_pr__rf_nfet_20v0_nvt_aup D PSUB S
-X0 D a_n900_n1000# S PSUB sky130_fd_pr__nfet_20v0_nvt w=1.5e+07u l=1.65e+07u
-X1 D a_n900_n1000# S PSUB sky130_fd_pr__nfet_20v0_nvt w=1.5e+07u l=1.65e+07u
+X0 D a_n900_n1000# S PSUB sky130_fd_pr__nfet_20v0_nvt w=3e+07u l=1.5e+06u
+X1 D a_n900_n1000# S PSUB sky130_fd_pr__nfet_20v0_nvt w=3e+07u l=1.5e+06u
 .ends
diff --git a/cells/rf_nfet_20v0_nvt_noptap_iso/sky130_fd_pr__rf_nfet_20v0_nvt_noptap_iso.spice b/cells/rf_nfet_20v0_nvt_noptap_iso/sky130_fd_pr__rf_nfet_20v0_nvt_noptap_iso.spice
index b8f1ffe..49507e4 100644
--- a/cells/rf_nfet_20v0_nvt_noptap_iso/sky130_fd_pr__rf_nfet_20v0_nvt_noptap_iso.spice
+++ b/cells/rf_nfet_20v0_nvt_noptap_iso/sky130_fd_pr__rf_nfet_20v0_nvt_noptap_iso.spice
@@ -16,6 +16,6 @@
 
 
 * Top level circuit sky130_fd_pr__rf_nfet_20v0_nvt_noptap_iso
-X0 dw_n2476_n1400# a_n700_n800# a_1000_0# SUBS sky130_fd_pr__nfet_20v0_nvt w=1.5e+07u l=1.65e+07u
-X1 dw_n2476_n1400# a_n700_n800# a_n826_0# SUBS sky130_fd_pr__nfet_20v0_nvt w=1.5e+07u l=1.65e+07u
+X0 dw_n2476_n1400# a_n700_n800# a_1000_0# SUBS sky130_fd_pr__nfet_20v0_nvt w=3e+07u l=1.5e+06u
+X1 dw_n2476_n1400# a_n700_n800# a_n826_0# SUBS sky130_fd_pr__nfet_20v0_nvt w=3e+07u l=1.5e+06u
 .end
diff --git a/cells/rf_nfet_20v0_nvt_withptap/sky130_fd_pr__rf_nfet_20v0_nvt_withptap.spice b/cells/rf_nfet_20v0_nvt_withptap/sky130_fd_pr__rf_nfet_20v0_nvt_withptap.spice
index 4b72840..614bb9c 100644
--- a/cells/rf_nfet_20v0_nvt_withptap/sky130_fd_pr__rf_nfet_20v0_nvt_withptap.spice
+++ b/cells/rf_nfet_20v0_nvt_withptap/sky130_fd_pr__rf_nfet_20v0_nvt_withptap.spice
@@ -16,6 +16,6 @@
 
 
 .subckt sky130_fd_pr__rf_nfet_20v0_nvt_withptap D G PSUB S
-X0 D G S PSUB sky130_fd_pr__nfet_20v0_nvt w=1.5e+07u l=1.65e+07u
-X1 D G S PSUB sky130_fd_pr__nfet_20v0_nvt w=1.5e+07u l=1.65e+07u
+X0 D G S PSUB sky130_fd_pr__nfet_20v0_nvt w=3e+07u l=1.5e+06u
+X1 D G S PSUB sky130_fd_pr__nfet_20v0_nvt w=3e+07u l=1.5e+06u
 .ends
diff --git a/cells/rf_nfet_20v0_nvt_withptap_iso/sky130_fd_pr__rf_nfet_20v0_nvt_withptap_iso.spice b/cells/rf_nfet_20v0_nvt_withptap_iso/sky130_fd_pr__rf_nfet_20v0_nvt_withptap_iso.spice
index 09299cd..3af7136 100644
--- a/cells/rf_nfet_20v0_nvt_withptap_iso/sky130_fd_pr__rf_nfet_20v0_nvt_withptap_iso.spice
+++ b/cells/rf_nfet_20v0_nvt_withptap_iso/sky130_fd_pr__rf_nfet_20v0_nvt_withptap_iso.spice
@@ -16,6 +16,6 @@
 
 
 * Top level circuit sky130_fd_pr__rf_nfet_20v0_nvt_withptap_iso
-X0 dw_n2476_n1400# a_n700_n800# a_1000_0# SUBS sky130_fd_pr__nfet_20v0_nvt w=1.5e+07u l=1.65e+07u
-X1 dw_n2476_n1400# a_n700_n800# a_n826_0# SUBS sky130_fd_pr__nfet_20v0_nvt w=1.5e+07u l=1.65e+07u
+X0 dw_n2476_n1400# a_n700_n800# a_1000_0# SUBS sky130_fd_pr__nfet_20v0_nvt w=3e+07u l=1.5e+06u
+X1 dw_n2476_n1400# a_n700_n800# a_n826_0# SUBS sky130_fd_pr__nfet_20v0_nvt w=3e+07u l=1.5e+06u
 .end
diff --git a/cells/rf_nfet_20v0_withptap/sky130_fd_pr__rf_nfet_20v0_withptap.spice b/cells/rf_nfet_20v0_withptap/sky130_fd_pr__rf_nfet_20v0_withptap.spice
index a77af6c..78bc381 100644
--- a/cells/rf_nfet_20v0_withptap/sky130_fd_pr__rf_nfet_20v0_withptap.spice
+++ b/cells/rf_nfet_20v0_withptap/sky130_fd_pr__rf_nfet_20v0_withptap.spice
@@ -16,6 +16,6 @@
 
 
 * Top level circuit sky130_fd_pr__rf_nfet_20v0_withptap
-X0 dw_n700_n714# a_n900_n1000# a_1050_0# SUBS sky130_fd_pr__nfet_20v0 w=1.5e+07u l=1.65e+07u
-X1 dw_n700_n714# a_n900_n1000# a_n958_0# SUBS sky130_fd_pr__nfet_20v0 w=1.5e+07u l=1.65e+07u
+X0 dw_n700_n714# a_n900_n1000# a_1050_0# SUBS sky130_fd_pr__nfet_20v0 w=3e+07u l=1.5e+06u
+X1 dw_n700_n714# a_n900_n1000# a_n958_0# SUBS sky130_fd_pr__nfet_20v0 w=3e+07u l=1.5e+06u
 .end
diff --git a/cells/rf_nfet_20v0_withptap_iso/sky130_fd_pr__rf_nfet_20v0_withptap_iso.spice b/cells/rf_nfet_20v0_withptap_iso/sky130_fd_pr__rf_nfet_20v0_withptap_iso.spice
index 4869d7e..65e700f 100644
--- a/cells/rf_nfet_20v0_withptap_iso/sky130_fd_pr__rf_nfet_20v0_withptap_iso.spice
+++ b/cells/rf_nfet_20v0_withptap_iso/sky130_fd_pr__rf_nfet_20v0_withptap_iso.spice
@@ -16,6 +16,6 @@
 
 
 * Top level circuit sky130_fd_pr__rf_nfet_20v0_withptap_iso
-X0 dw_n2476_n1400# a_n700_n800# a_1000_0# SUBS sky130_fd_pr__nfet_20v0 w=1.5e+07u l=1.65e+07u
-X1 dw_n2476_n1400# a_n700_n800# a_n826_0# SUBS sky130_fd_pr__nfet_20v0 w=1.5e+07u l=1.65e+07u
+X0 dw_n2476_n1400# a_n700_n800# a_1000_0# SUBS sky130_fd_pr__nfet_20v0 w=3e+07u l=1.5e+06u
+X1 dw_n2476_n1400# a_n700_n800# a_n826_0# SUBS sky130_fd_pr__nfet_20v0 w=3e+07u l=1.5e+06u
 .end
diff --git a/cells/rf_nfet_20v0_zvt_withptap/sky130_fd_pr__rf_nfet_20v0_zvt_withptap.spice b/cells/rf_nfet_20v0_zvt_withptap/sky130_fd_pr__rf_nfet_20v0_zvt_withptap.spice
index 01aafe4..e654882 100644
--- a/cells/rf_nfet_20v0_zvt_withptap/sky130_fd_pr__rf_nfet_20v0_zvt_withptap.spice
+++ b/cells/rf_nfet_20v0_zvt_withptap/sky130_fd_pr__rf_nfet_20v0_zvt_withptap.spice
@@ -16,6 +16,6 @@
 
 
 .subckt sky130_fd_pr__rf_nfet_20v0_zvt_withptap D PSUB S
-X0 D a_n1600_n800# S PSUB sky130_fd_pr__nfet_20v0_nvt w=1.5e+07u l=2.1e+07u
-X1 D a_n1600_n800# S PSUB sky130_fd_pr__nfet_20v0_nvt w=1.5e+07u l=2.1e+07u
+X0 D a_n1600_n800# S PSUB sky130_fd_pr__nfet_20v0_nvt w=3e+07u l=6e+06u
+X1 D a_n1600_n800# S PSUB sky130_fd_pr__nfet_20v0_nvt w=3e+07u l=6e+06u
 .ends
diff --git a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM04W3p00L0p50.cdl b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM04W3p00L0p50.cdl
index 195d75c..13cadf0 100644
--- a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM04W3p00L0p50.cdl
+++ b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM04W3p00L0p50.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_g5v0d10v5_aM04W3p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
 .ENDS sky130_fd_pr__rf_nfet_g5v0d10v5_aM04W3p00L0p50
diff --git a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM04W5p00L0p50.cdl b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM04W5p00L0p50.cdl
index a672535..0c76afd 100644
--- a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM04W5p00L0p50.cdl
+++ b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM04W5p00L0p50.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_g5v0d10v5_aM04W5p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
 .ENDS sky130_fd_pr__rf_nfet_g5v0d10v5_aM04W5p00L0p50
diff --git a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM04W7p00L0p50.cdl b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM04W7p00L0p50.cdl
index 0e66b0b..9743d94 100644
--- a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM04W7p00L0p50.cdl
+++ b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM04W7p00L0p50.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_g5v0d10v5_aM04W7p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
 .ENDS sky130_fd_pr__rf_nfet_g5v0d10v5_aM04W7p00L0p50
diff --git a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM10W3p00L0p50.cdl b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM10W3p00L0p50.cdl
index 5523b77..7dde3e5 100644
--- a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM10W3p00L0p50.cdl
+++ b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM10W3p00L0p50.cdl
@@ -16,14 +16,14 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_g5v0d10v5_aM10W3p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M5 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M6 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M7 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M8 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M9 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M10 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M5 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M6 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M7 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M8 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M9 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M10 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
 .ENDS sky130_fd_pr__rf_nfet_g5v0d10v5_aM10W3p00L0p50
diff --git a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM10W5p00L0p50.cdl b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM10W5p00L0p50.cdl
index 0838e15..c3443d2 100644
--- a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM10W5p00L0p50.cdl
+++ b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM10W5p00L0p50.cdl
@@ -16,14 +16,14 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_g5v0d10v5_aM10W5p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M5 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M6 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M7 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M8 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M9 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M10 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M5 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M6 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M7 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M8 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M9 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M10 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
 .ENDS sky130_fd_pr__rf_nfet_g5v0d10v5_aM10W5p00L0p50
diff --git a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM10W7p00L0p50.cdl b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM10W7p00L0p50.cdl
index 1dca4a0..2a043d8 100644
--- a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM10W7p00L0p50.cdl
+++ b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_aM10W7p00L0p50.cdl
@@ -16,14 +16,14 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_g5v0d10v5_aM10W7p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M5 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M6 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M7 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M8 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M9 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M10 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M5 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M6 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M7 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M8 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M9 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M10 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
 .ENDS sky130_fd_pr__rf_nfet_g5v0d10v5_aM10W7p00L0p50
diff --git a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM02W3p00L0p50.cdl b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM02W3p00L0p50.cdl
index 55a2d39..49ed377 100644
--- a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM02W3p00L0p50.cdl
+++ b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM02W3p00L0p50.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_g5v0d10v5_bM02W3p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_g5v0d10v5_bM02W3p00L0p50
diff --git a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM02W5p00L0p50.cdl b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM02W5p00L0p50.cdl
index df9e7b0..5c01380 100644
--- a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM02W5p00L0p50.cdl
+++ b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM02W5p00L0p50.cdl
@@ -16,8 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_g5v0d10v5_bM02W5p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M3 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M4 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M3 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5
++ m=1
+M4 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_g5v0d10v5_bM02W5p00L0p50
diff --git a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM04W3p00L0p50.cdl b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM04W3p00L0p50.cdl
index ab6d679..a79f401 100644
--- a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM04W3p00L0p50.cdl
+++ b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM04W3p00L0p50.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_g5v0d10v5_bM04W3p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_g5v0d10v5_bM04W3p00L0p50
diff --git a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM04W5p00L0p50.cdl b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM04W5p00L0p50.cdl
index f9415e9..cacf217 100644
--- a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM04W5p00L0p50.cdl
+++ b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM04W5p00L0p50.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_g5v0d10v5_bM04W5p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_g5v0d10v5_bM04W5p00L0p50
diff --git a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM04W7p00L0p50.cdl b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM04W7p00L0p50.cdl
index c772df3..1663d14 100644
--- a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM04W7p00L0p50.cdl
+++ b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM04W7p00L0p50.cdl
@@ -16,10 +16,12 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_g5v0d10v5_bM04W7p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M5 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M6 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M5 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5
++ m=1
+M6 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_g5v0d10v5_bM04W7p00L0p50
diff --git a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM10W3p00L0p50.cdl b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM10W3p00L0p50.cdl
index 3e96b48..5000fc4 100644
--- a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM10W3p00L0p50.cdl
+++ b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM10W3p00L0p50.cdl
@@ -16,16 +16,18 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_g5v0d10v5_bM10W3p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M5 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M6 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M7 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M8 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M9 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M10 DRAIN GATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M11 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
-M12 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M5 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M6 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M7 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M8 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M9 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M10 DRAIN GATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5 m=1
+M11 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5
++ m=1
+M12 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=3.01 l=0.5
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_g5v0d10v5_bM10W3p00L0p50
diff --git a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM10W5p00L0p50.cdl b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM10W5p00L0p50.cdl
index 8c068bc..a49a64a 100644
--- a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM10W5p00L0p50.cdl
+++ b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM10W5p00L0p50.cdl
@@ -16,16 +16,18 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_g5v0d10v5_bM10W5p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M5 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M6 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M7 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M8 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M9 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M10 DRAIN GATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M11 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
-M12 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M5 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M6 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M7 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M8 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M9 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M10 DRAIN GATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5 m=1
+M11 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5
++ m=1
+M12 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=5.05 l=0.5
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_g5v0d10v5_bM10W5p00L0p50
diff --git a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM10W7p00L0p50.cdl b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM10W7p00L0p50.cdl
index 3d3c062..27b85f1 100644
--- a/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM10W7p00L0p50.cdl
+++ b/cells/rf_nfet_g5v0d10v5/sky130_fd_pr__rf_nfet_g5v0d10v5_bM10W7p00L0p50.cdl
@@ -16,16 +16,18 @@
 
 .SUBCKT sky130_fd_pr__rf_nfet_g5v0d10v5_bM10W7p00L0p50 DRAIN GATE SOURCE SUBSTRATE
 *.PININFO DRAIN:? GATE:? SOURCE:? SUBSTRATE:?
-M1 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M2 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M3 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M4 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M5 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M6 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M7 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M8 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M9 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M10 DRAIN GATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M11 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
-M12 SUBSTRATE SUBSTRATE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M1 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M2 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M3 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M4 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M5 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M6 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M7 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M8 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M9 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M10 DRAIN GATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5 m=1
+M11 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5
++ m=1
+M12 SUBSTRATE SUBSTRATE SOURCE SUBSTRATE model_use_only w=7.09 l=0.5
++ m=1
 .ENDS sky130_fd_pr__rf_nfet_g5v0d10v5_bM10W7p00L0p50
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF02W0p84L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF02W0p84L0p15.cdl
index c36fe18..bccd09d 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF02W0p84L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF02W0p84L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aF02W0p84L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=0.84 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=0.84 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=0.84 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=0.84 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aF02W0p84L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF02W1p68L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF02W1p68L0p15.cdl
index 2313664..e7a1149 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF02W1p68L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF02W1p68L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aF02W1p68L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.68 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=1.68 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.68 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.68 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aF02W1p68L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF02W3p00L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF02W3p00L0p15.cdl
index 200cf06..750e7b4 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF02W3p00L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF02W3p00L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aF02W3p00L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.0 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=3.0 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.0 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.0 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aF02W3p00L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF02W5p00L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF02W5p00L0p15.cdl
index df96cae..0392961 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF02W5p00L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF02W5p00L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aF02W5p00L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.0 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=5.0 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.0 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.0 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aF02W5p00L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF04W1p68L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF04W1p68L0p15.cdl
index 9b48ef7..b184c0c 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF04W1p68L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aF04W1p68L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aF04W1p68L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.68 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=1.68 l=0.15 m=1
-M3 DRAIN GATE BULK model_use_only w=1.68 l=0.15 m=1
-M4 DRAIN GATE BULK model_use_only w=1.68 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.68 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.68 l=0.15 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=1.68 l=0.15 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=1.68 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aF04W1p68L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W1p65L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W1p65L0p15.cdl
index b5a1c22..2aad17f 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W1p65L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W1p65L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aM02W1p65L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aM02W1p65L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W1p65L0p18.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W1p65L0p18.cdl
index 55f75d5..4aaaaa2 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W1p65L0p18.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W1p65L0p18.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aM02W1p65L0p18 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.65 l=0.18 m=1
-M2 DRAIN GATE BULK model_use_only w=1.65 l=0.18 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.18 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.18 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aM02W1p65L0p18
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W1p65L0p25.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W1p65L0p25.cdl
index eeeb059..af4b2ea 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W1p65L0p25.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W1p65L0p25.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aM02W1p65L0p25 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.65 l=0.25 m=1
-M2 DRAIN GATE BULK model_use_only w=1.65 l=0.25 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.25 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.25 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aM02W1p65L0p25
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W3p00L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W3p00L0p15.cdl
index e082e5d..69eb236 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W3p00L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W3p00L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aM02W3p00L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aM02W3p00L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W3p00L0p18.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W3p00L0p18.cdl
index 8587719..2137416 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W3p00L0p18.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W3p00L0p18.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aM02W3p00L0p18 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.18 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.18 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.18 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.18 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aM02W3p00L0p18
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W3p00L0p25.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W3p00L0p25.cdl
index d5868ee..e2eacf6 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W3p00L0p25.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W3p00L0p25.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aM02W3p00L0p25 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.25 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.25 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.25 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.25 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aM02W3p00L0p25
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W5p00L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W5p00L0p15.cdl
index 2a6e084..c36a901 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W5p00L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W5p00L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aM02W5p00L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aM02W5p00L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W5p00L0p18.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W5p00L0p18.cdl
index 72da216..84e6de1 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W5p00L0p18.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W5p00L0p18.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aM02W5p00L0p18 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.18 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.18 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.18 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.18 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aM02W5p00L0p18
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W5p00L0p25.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W5p00L0p25.cdl
index feedeb7..5603fef 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W5p00L0p25.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM02W5p00L0p25.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aM02W5p00L0p25 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.25 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.25 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.25 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.25 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aM02W5p00L0p25
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W1p65L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W1p65L0p15.cdl
index adcc83d..147ec85 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W1p65L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W1p65L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aM04W1p65L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=1.65 l=0.15 m=1
-M3 DRAIN GATE BULK model_use_only w=1.65 l=0.15 m=1
-M4 DRAIN GATE BULK model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aM04W1p65L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W1p65L0p18.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W1p65L0p18.cdl
index 9ea3309..71d8d48 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W1p65L0p18.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W1p65L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aM04W1p65L0p18 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.65 l=0.18 m=1
-M2 DRAIN GATE BULK model_use_only w=1.65 l=0.18 m=1
-M3 DRAIN GATE BULK model_use_only w=1.65 l=0.18 m=1
-M4 DRAIN GATE BULK model_use_only w=1.65 l=0.18 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.18 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.18 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.18 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.18 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aM04W1p65L0p18
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W1p65L0p25.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W1p65L0p25.cdl
index 51a81b5..a358256 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W1p65L0p25.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W1p65L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aM04W1p65L0p25 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.65 l=0.25 m=1
-M2 DRAIN GATE BULK model_use_only w=1.65 l=0.25 m=1
-M3 DRAIN GATE BULK model_use_only w=1.65 l=0.25 m=1
-M4 DRAIN GATE BULK model_use_only w=1.65 l=0.25 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.25 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.25 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.25 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.25 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aM04W1p65L0p25
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W3p00L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W3p00L0p15.cdl
index 25a10df..ffcf253 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W3p00L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W3p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aM04W3p00L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M3 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M4 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aM04W3p00L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W3p00L0p18.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W3p00L0p18.cdl
index 7c0cead..9568cac 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W3p00L0p18.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W3p00L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aM04W3p00L0p18 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.18 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.18 m=1
-M3 DRAIN GATE BULK model_use_only w=3.01 l=0.18 m=1
-M4 DRAIN GATE BULK model_use_only w=3.01 l=0.18 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.18 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.18 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.18 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.18 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aM04W3p00L0p18
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W3p00L0p25.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W3p00L0p25.cdl
index b35a01c..b8cc873 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W3p00L0p25.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W3p00L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aM04W3p00L0p25 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.25 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.25 m=1
-M3 DRAIN GATE BULK model_use_only w=3.01 l=0.25 m=1
-M4 DRAIN GATE BULK model_use_only w=3.01 l=0.25 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.25 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.25 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.25 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.25 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aM04W3p00L0p25
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W5p00L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W5p00L0p15.cdl
index cfbb623..13c8e7a 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W5p00L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W5p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aM04W5p00L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M3 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M4 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aM04W5p00L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W5p00L0p18.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W5p00L0p18.cdl
index 926cffc..2dc06d6 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W5p00L0p18.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W5p00L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aM04W5p00L0p18 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.18 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.18 m=1
-M3 DRAIN GATE BULK model_use_only w=5.05 l=0.18 m=1
-M4 DRAIN GATE BULK model_use_only w=5.05 l=0.18 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.18 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.18 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.18 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.18 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aM04W5p00L0p18
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W5p00L0p25.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W5p00L0p25.cdl
index fc560b8..e4acec5 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W5p00L0p25.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_aM04W5p00L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_aM04W5p00L0p25 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.25 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.25 m=1
-M3 DRAIN GATE BULK model_use_only w=5.05 l=0.25 m=1
-M4 DRAIN GATE BULK model_use_only w=5.05 l=0.25 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.25 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.25 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.25 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.25 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_aM04W5p00L0p25
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W1p65L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W1p65L0p15.cdl
index f54ad5f..162fcb2 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W1p65L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W1p65L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_bM02W1p65L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=1.65 l=0.15 m=1
-M3 BULK BULK BULK model_use_only w=1.65 l=0.15 m=1
-M4 BULK BULK BULK model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M3 BULK BULK SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M4 BULK BULK SOURCE BULK model_use_only w=1.65 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_bM02W1p65L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W1p65L0p18.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W1p65L0p18.cdl
index 8ea510b..75fc7e3 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W1p65L0p18.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W1p65L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_bM02W1p65L0p18 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.65 l=0.18 m=1
-M2 DRAIN GATE BULK model_use_only w=1.65 l=0.18 m=1
-M3 BULK BULK BULK model_use_only w=1.65 l=0.15 m=1
-M4 BULK BULK BULK model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.18 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.18 m=1
+M3 BULK BULK SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M4 BULK BULK SOURCE BULK model_use_only w=1.65 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_bM02W1p65L0p18
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W1p65L0p25.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W1p65L0p25.cdl
index 790109a..f3c8db7 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W1p65L0p25.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W1p65L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_bM02W1p65L0p25 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.65 l=0.25 m=1
-M2 DRAIN GATE BULK model_use_only w=1.65 l=0.25 m=1
-M3 BULK BULK BULK model_use_only w=1.65 l=0.15 m=1
-M4 BULK BULK BULK model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.25 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.25 m=1
+M3 BULK BULK SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M4 BULK BULK SOURCE BULK model_use_only w=1.65 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_bM02W1p65L0p25
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W3p00L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W3p00L0p15.cdl
index 6d8505b..d58e634 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W3p00L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W3p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_bM02W3p00L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M3 BULK BULK BULK model_use_only w=3.01 l=0.15 m=1
-M4 BULK BULK BULK model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M3 BULK BULK SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M4 BULK BULK SOURCE BULK model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_bM02W3p00L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W3p00L0p18.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W3p00L0p18.cdl
index 1d29744..3991eec 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W3p00L0p18.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W3p00L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_bM02W3p00L0p18 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.18 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.18 m=1
-M3 BULK BULK BULK model_use_only w=3.01 l=0.15 m=1
-M4 BULK BULK BULK model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.18 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.18 m=1
+M3 BULK BULK SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M4 BULK BULK SOURCE BULK model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_bM02W3p00L0p18
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W3p00L0p25.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W3p00L0p25.cdl
index 4f40d3c..392d269 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W3p00L0p25.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W3p00L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_bM02W3p00L0p25 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.25 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.25 m=1
-M3 BULK BULK BULK model_use_only w=3.01 l=0.15 m=1
-M4 BULK BULK BULK model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.25 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.25 m=1
+M3 BULK BULK SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M4 BULK BULK SOURCE BULK model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_bM02W3p00L0p25
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W5p00L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W5p00L0p15.cdl
index 00dc692..b4cd4cc 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W5p00L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W5p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_bM02W5p00L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M3 BULK BULK BULK model_use_only w=5.05 l=0.15 m=1
-M4 BULK BULK BULK model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M3 BULK BULK SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M4 BULK BULK SOURCE BULK model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_bM02W5p00L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W5p00L0p18.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W5p00L0p18.cdl
index 30418f5..047a6bf 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W5p00L0p18.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W5p00L0p18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_bM02W5p00L0p18 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.18 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.18 m=1
-M3 BULK BULK BULK model_use_only w=5.05 l=0.15 m=1
-M4 BULK BULK BULK model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.18 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.18 m=1
+M3 BULK BULK SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M4 BULK BULK SOURCE BULK model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_bM02W5p00L0p18
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W5p00L0p25.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W5p00L0p25.cdl
index be7a224..2d604c0 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W5p00L0p25.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM02W5p00L0p25.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_bM02W5p00L0p25 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.25 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.25 m=1
-M3 BULK BULK BULK model_use_only w=5.05 l=0.15 m=1
-M4 BULK BULK BULK model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.25 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.25 m=1
+M3 BULK BULK SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M4 BULK BULK SOURCE BULK model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_bM02W5p00L0p25
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W1p65L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W1p65L0p15.cdl
index 1fbe07e..47358f2 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W1p65L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W1p65L0p15.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_bM04W1p65L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.65 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=1.65 l=0.15 m=1
-M3 DRAIN GATE BULK model_use_only w=1.65 l=0.15 m=1
-M4 DRAIN GATE BULK model_use_only w=1.65 l=0.15 m=1
-M5 BULK BULK BULK model_use_only w=1.65 l=0.15 m=1
-M6 BULK BULK BULK model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M5 BULK BULK SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M6 BULK BULK SOURCE BULK model_use_only w=1.65 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_bM04W1p65L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W1p65L0p18.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W1p65L0p18.cdl
index 1f76859..7141aa1 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W1p65L0p18.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W1p65L0p18.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_bM04W1p65L0p18 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.65 l=0.18 m=1
-M2 DRAIN GATE BULK model_use_only w=1.65 l=0.18 m=1
-M3 DRAIN GATE BULK model_use_only w=1.65 l=0.18 m=1
-M4 DRAIN GATE BULK model_use_only w=1.65 l=0.18 m=1
-M5 BULK BULK BULK model_use_only w=1.65 l=0.15 m=1
-M6 BULK BULK BULK model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.18 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.18 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.18 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.18 m=1
+M5 BULK BULK SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M6 BULK BULK SOURCE BULK model_use_only w=1.65 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_bM04W1p65L0p18
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W1p65L0p25.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W1p65L0p25.cdl
index 0a68e25..88b8124 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W1p65L0p25.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W1p65L0p25.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_bM04W1p65L0p25 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=1.65 l=0.25 m=1
-M2 DRAIN GATE BULK model_use_only w=1.65 l=0.25 m=1
-M3 DRAIN GATE BULK model_use_only w=1.65 l=0.25 m=1
-M4 DRAIN GATE BULK model_use_only w=1.65 l=0.25 m=1
-M5 BULK BULK BULK model_use_only w=1.65 l=0.15 m=1
-M6 BULK BULK BULK model_use_only w=1.65 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.25 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.25 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.25 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=1.65 l=0.25 m=1
+M5 BULK BULK SOURCE BULK model_use_only w=1.65 l=0.15 m=1
+M6 BULK BULK SOURCE BULK model_use_only w=1.65 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_bM04W1p65L0p25
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W3p00L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W3p00L0p15.cdl
index 3271c30..f660413 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W3p00L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W3p00L0p15.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_bM04W3p00L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M3 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M4 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M5 BULK BULK BULK model_use_only w=3.01 l=0.15 m=1
-M6 BULK BULK BULK model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M5 BULK BULK SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M6 BULK BULK SOURCE BULK model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_bM04W3p00L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W3p00L0p18.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W3p00L0p18.cdl
index 25b4be5..ec88caf 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W3p00L0p18.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W3p00L0p18.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_bM04W3p00L0p18 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.18 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.18 m=1
-M3 DRAIN GATE BULK model_use_only w=3.01 l=0.18 m=1
-M4 DRAIN GATE BULK model_use_only w=3.01 l=0.18 m=1
-M5 BULK BULK BULK model_use_only w=3.01 l=0.15 m=1
-M6 BULK BULK BULK model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.18 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.18 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.18 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.18 m=1
+M5 BULK BULK SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M6 BULK BULK SOURCE BULK model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_bM04W3p00L0p18
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W3p00L0p25.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W3p00L0p25.cdl
index fe0f6d0..a0b2c50 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W3p00L0p25.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W3p00L0p25.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_bM04W3p00L0p25 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.25 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.25 m=1
-M3 DRAIN GATE BULK model_use_only w=3.01 l=0.25 m=1
-M4 DRAIN GATE BULK model_use_only w=3.01 l=0.25 m=1
-M5 BULK BULK BULK model_use_only w=3.01 l=0.15 m=1
-M6 BULK BULK BULK model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.25 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.25 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.25 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.25 m=1
+M5 BULK BULK SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M6 BULK BULK SOURCE BULK model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_bM04W3p00L0p25
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W5p00L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W5p00L0p15.cdl
index 2ea96ee..c9761ff 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W5p00L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W5p00L0p15.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_bM04W5p00L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M3 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M4 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M5 BULK BULK BULK model_use_only w=5.05 l=0.15 m=1
-M6 BULK BULK BULK model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M5 BULK BULK SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M6 BULK BULK SOURCE BULK model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_bM04W5p00L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W5p00L0p18.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W5p00L0p18.cdl
index adae9ae..8c0bf4d 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W5p00L0p18.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W5p00L0p18.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_bM04W5p00L0p18 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.18 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.18 m=1
-M3 DRAIN GATE BULK model_use_only w=5.05 l=0.18 m=1
-M4 DRAIN GATE BULK model_use_only w=5.05 l=0.18 m=1
-M5 BULK BULK BULK model_use_only w=5.05 l=0.15 m=1
-M6 BULK BULK BULK model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.18 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.18 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.18 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.18 m=1
+M5 BULK BULK SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M6 BULK BULK SOURCE BULK model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_bM04W5p00L0p18
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W5p00L0p25.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W5p00L0p25.cdl
index 0d19c7d..0e2e68c 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W5p00L0p25.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_bM04W5p00L0p25.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_bM04W5p00L0p25 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.25 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.25 m=1
-M3 DRAIN GATE BULK model_use_only w=5.05 l=0.25 m=1
-M4 DRAIN GATE BULK model_use_only w=5.05 l=0.25 m=1
-M5 BULK BULK BULK model_use_only w=5.05 l=0.15 m=1
-M6 BULK BULK BULK model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.25 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.25 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.25 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.25 m=1
+M5 BULK BULK SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M6 BULK BULK SOURCE BULK model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_bM04W5p00L0p25
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_hcM04W3p00L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_hcM04W3p00L0p15.cdl
index b5192ee..53a9fee 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_hcM04W3p00L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_hcM04W3p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_hcM04W3p00L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M3 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M4 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_hcM04W3p00L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_hcM04W5p00L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_hcM04W5p00L0p15.cdl
index 870501d..55a63b2 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_hcM04W5p00L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_hcM04W5p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_hcM04W5p00L0p15 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M3 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M4 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_hcM04W5p00L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_mcM04W3p00L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_mcM04W3p00L0p15.cdl
index 4dc7c53..1a4d1c9 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_mcM04W3p00L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_mcM04W3p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_mcM04W3p00L0p15 DRAIN GATE SOURCE BULK
 *.PININFO DRAIN:? GATE:? SOURCE:? BULK:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M3 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
-M4 DRAIN GATE BULK model_use_only w=3.01 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_mcM04W3p00L0p15
diff --git a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_mcM04W5p00L0p15.cdl b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_mcM04W5p00L0p15.cdl
index eff3a88..ba185ef 100644
--- a/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_mcM04W5p00L0p15.cdl
+++ b/cells/rf_pfet_01v8/sky130_fd_pr__rf_pfet_01v8_mcM04W5p00L0p15.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_mcM04W5p00L0p15 DRAIN GATE SOURCE BULK
 *.PININFO DRAIN:? GATE:? SOURCE:? BULK:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M3 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
-M4 DRAIN GATE BULK model_use_only w=5.05 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_mcM04W5p00L0p15
diff --git a/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM02W3p00L0p35.cdl b/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM02W3p00L0p35.cdl
index 35cc70b..b046934 100644
--- a/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM02W3p00L0p35.cdl
+++ b/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM02W3p00L0p35.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_lvt_aM02W3p00L0p35 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.35 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.35 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.35 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.35 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_lvt_aM02W3p00L0p35
diff --git a/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM02W3p00L0p50.cdl b/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM02W3p00L0p50.cdl
index 8615d49..392e807 100644
--- a/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM02W3p00L0p50.cdl
+++ b/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM02W3p00L0p50.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_lvt_aM02W3p00L0p50 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.5 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.5 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.5 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.5 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_lvt_aM02W3p00L0p50
diff --git a/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM02W5p00L0p35.cdl b/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM02W5p00L0p35.cdl
index 50453ed..2e0cb4b 100644
--- a/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM02W5p00L0p35.cdl
+++ b/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM02W5p00L0p35.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_lvt_aM02W5p00L0p35 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.35 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.35 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.35 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.35 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_lvt_aM02W5p00L0p35
diff --git a/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM02W5p00L0p50.cdl b/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM02W5p00L0p50.cdl
index 0dc0921..6e30c60 100644
--- a/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM02W5p00L0p50.cdl
+++ b/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM02W5p00L0p50.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_lvt_aM02W5p00L0p50 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.5 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.5 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.5 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.5 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_lvt_aM02W5p00L0p50
diff --git a/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM04W3p00L0p35.cdl b/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM04W3p00L0p35.cdl
index 36106fa..f5e3b14 100644
--- a/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM04W3p00L0p35.cdl
+++ b/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM04W3p00L0p35.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_lvt_aM04W3p00L0p35 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.35 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.35 m=1
-M3 DRAIN GATE BULK model_use_only w=3.01 l=0.35 m=1
-M4 DRAIN GATE BULK model_use_only w=3.01 l=0.35 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.35 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.35 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.35 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.35 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_lvt_aM04W3p00L0p35
diff --git a/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM04W3p00L0p50.cdl b/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM04W3p00L0p50.cdl
index 037d767..f931850 100644
--- a/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM04W3p00L0p50.cdl
+++ b/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM04W3p00L0p50.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_lvt_aM04W3p00L0p50 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=3.01 l=0.5 m=1
-M2 DRAIN GATE BULK model_use_only w=3.01 l=0.5 m=1
-M3 DRAIN GATE BULK model_use_only w=3.01 l=0.5 m=1
-M4 DRAIN GATE BULK model_use_only w=3.01 l=0.5 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.5 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.5 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.5 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=3.01 l=0.5 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_lvt_aM04W3p00L0p50
diff --git a/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM04W5p00L0p35.cdl b/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM04W5p00L0p35.cdl
index b02b7ae..299776f 100644
--- a/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM04W5p00L0p35.cdl
+++ b/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM04W5p00L0p35.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_lvt_aM04W5p00L0p35 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.35 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.35 m=1
-M3 DRAIN GATE BULK model_use_only w=5.05 l=0.35 m=1
-M4 DRAIN GATE BULK model_use_only w=5.05 l=0.35 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.35 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.35 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.35 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.35 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_lvt_aM04W5p00L0p35
diff --git a/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM04W5p00L0p50.cdl b/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM04W5p00L0p50.cdl
index 37929f3..8c1db90 100644
--- a/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM04W5p00L0p50.cdl
+++ b/cells/rf_pfet_01v8_lvt/sky130_fd_pr__rf_pfet_01v8_lvt_aM04W5p00L0p50.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_lvt_aM04W5p00L0p50 BULK DRAIN GATE SOURCE
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=5.05 l=0.5 m=1
-M2 DRAIN GATE BULK model_use_only w=5.05 l=0.5 m=1
-M3 DRAIN GATE BULK model_use_only w=5.05 l=0.5 m=1
-M4 DRAIN GATE BULK model_use_only w=5.05 l=0.5 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.5 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.5 m=1
+M3 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.5 m=1
+M4 DRAIN GATE SOURCE BULK model_use_only w=5.05 l=0.5 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_lvt_aM04W5p00L0p50
diff --git a/cells/rf_pfet_01v8_mvt/sky130_fd_pr__rf_pfet_01v8_mvt_aF02W0p84L0p15.cdl b/cells/rf_pfet_01v8_mvt/sky130_fd_pr__rf_pfet_01v8_mvt_aF02W0p84L0p15.cdl
index f0d12ae..771f936 100644
--- a/cells/rf_pfet_01v8_mvt/sky130_fd_pr__rf_pfet_01v8_mvt_aF02W0p84L0p15.cdl
+++ b/cells/rf_pfet_01v8_mvt/sky130_fd_pr__rf_pfet_01v8_mvt_aF02W0p84L0p15.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_pr__rf_pfet_01v8_mvt_aF02W0p84L0p15 BULK DRAIN GATE SOURCE Name= Formula= techLibCellName=-1 nd= ng= ns= nb= mname= w= l= m=
 *.PININFO BULK:? DRAIN:? GATE:? SOURCE:?
-M1 DRAIN GATE BULK model_use_only w=0.84 l=0.15 m=1
-M2 DRAIN GATE BULK model_use_only w=0.84 l=0.15 m=1
+M1 DRAIN GATE SOURCE BULK model_use_only w=0.84 l=0.15 m=1
+M2 DRAIN GATE SOURCE BULK model_use_only w=0.84 l=0.15 m=1
 .ENDS sky130_fd_pr__rf_pfet_01v8_mvt_aF02W0p84L0p15
diff --git a/cells/rf_pfet_20v0_withptap/sky130_fd_pr__rf_pfet_20v0_withptap.spice b/cells/rf_pfet_20v0_withptap/sky130_fd_pr__rf_pfet_20v0_withptap.spice
index 7cebb46..2e5879c 100644
--- a/cells/rf_pfet_20v0_withptap/sky130_fd_pr__rf_pfet_20v0_withptap.spice
+++ b/cells/rf_pfet_20v0_withptap/sky130_fd_pr__rf_pfet_20v0_withptap.spice
@@ -16,6 +16,6 @@
 
 
 * Top level circuit sky130_fd_pr__rf_pfet_20v0_withptap
-X0 SUBS a_n600_n800# a_750_0# dw_n1298_n1522# sky130_fd_pr__pfet_20v0 w=1.5e+07u l=1.55e+07u
-X1 SUBS a_n600_n800# a_n658_0# dw_n1298_n1522# sky130_fd_pr__pfet_20v0 w=1.5e+07u l=1.55e+07u
+X0 SUBS a_n600_n800# a_750_0# dw_n1298_n1522# sky130_fd_pr__pfet_20v0 w=3e+07u l=500000u
+X1 SUBS a_n600_n800# a_n658_0# dw_n1298_n1522# sky130_fd_pr__pfet_20v0 w=3e+07u l=500000u
 .end