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/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/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_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