diff --git a/input/model/vehicle_class_toll_factors.csv b/input/model/vehicle_class_toll_factors.csv
index 6c8a6f373..c763d18d4 100644
--- a/input/model/vehicle_class_toll_factors.csv
+++ b/input/model/vehicle_class_toll_factors.csv
@@ -16,72 +16,71 @@ SR-11,4,2025,ALL,1,1,1,1,1.03,2.33
 I-15,3,2026,ALL,1,1,0,99,99,99
 SR-125,4,2026,ALL,1,1,1,1,1.03,2.33
 SR-11,4,2026,ALL,1,1,1,1,1.03,2.33
-I-15,3,2029,ALL,1,1,0,99,99,99
+I-15,3,2029,ALL,1,0.5,0,99,99,99
 SR-125,4,2029,ALL,1,1,1,1,1.03,2.33
 SR-11,4,2029,ALL,1,1,1,1,1.03,2.33
-I-5,3,2029,ALL,1,1,0,99,99,99
-SR-78,3,2029,ALL,1,1,0,99,99,99
-I-805,3,2029,ALL,1,1,0,99,99,99
-SR-163,3,2029,ALL,1,1,0,99,99,99
-SR-125,3,2029,ALL,1,1,0,99,99,99
-SR-56,3,2029,ALL,1,1,0,99,99,99
-I-15,3,2030,ALL,1,1,0,99,99,99
+I-5,3,2029,ALL,1,0.5,0,99,99,99
+SR-78,3,2029,ALL,1,0.5,0,99,99,99
+I-805,3,2029,ALL,1,0.5,0,99,99,99
+SR-163,3,2029,ALL,1,0.5,0,99,99,99
+SR-125,3,2029,ALL,1,0.5,0,99,99,99
+SR-56,3,2029,ALL,1,0.5,0,99,99,99
+I-15,3,2030,ALL,1,0.5,0,99,99,99
 SR-125,4,2030,ALL,1,1,1,1,1.03,2.33
 SR-11,4,2030,ALL,1,1,1,1,1.03,2.33
-I-5,3,2030,ALL,1,1,0,99,99,99
-SR-78,3,2030,ALL,1,1,0,99,99,99
-I-805,3,2030,ALL,1,1,0,99,99,99
-SR-163,3,2030,ALL,1,1,0,99,99,99
-SR-125,3,2030,ALL,1,1,0,99,99,99
-SR-56,3,2030,ALL,1,1,0,99,99,99
-I-15,3,2032,ALL,1,1,0,99,99,99
+I-5,3,2030,ALL,1,0.5,0,99,99,99
+SR-78,3,2030,ALL,1,0.5,0,99,99,99
+I-805,3,2030,ALL,1,0.5,0,99,99,99
+SR-163,3,2030,ALL,1,0.5,0,99,99,99
+SR-125,3,2030,ALL,1,0.5,0,99,99,99
+SR-56,3,2030,ALL,1,0.5,0,99,99,99
+I-15,3,2032,ALL,1,0.5,0,99,99,99
 SR-125,4,2032,ALL,1,1,1,1,1.03,2.33
 SR-11,4,2032,ALL,1,1,1,1,1.03,2.33
-I-5,3,2032,ALL,1,1,0,99,99,99
-SR-78,3,2032,ALL,1,1,0,99,99,99
-I-805,3,2032,ALL,1,1,0,99,99,99
-SR-163,3,2032,ALL,1,1,0,99,99,99
-SR-125,3,2032,ALL,1,1,0,99,99,99
-SR-56,3,2032,ALL,1,1,0,99,99,99
-SR-52,3,2032,ALL,1,1,0,99,99,99
-I-5,3,2035,ALL,1,1,0,99,99,99
-I-8,3,2035,ALL,1,1,0,99,99,99
+I-5,3,2032,ALL,1,0.5,0,99,99,99
+SR-78,3,2032,ALL,1,0.5,0,99,99,99
+I-805,3,2032,ALL,1,0.5,0,99,99,99
+SR-163,3,2032,ALL,1,0.5,0,99,99,99
+SR-125,3,2032,ALL,1,0.5,0,99,99,99
+SR-56,3,2032,ALL,1,0.5,0,99,99,99
+SR-52,3,2032,ALL,1,0.5,0,99,99,99
+I-5,3,2035,ALL,1,0.5,0,99,99,99
+I-8,3,2035,ALL,1,0.5,0,99,99,99
 SR-11,4,2035,ALL,1,1,1,1,1.03,2.33
-I-15,3,2035,ALL,1,1,0,99,99,99
-SR-15,3,2035,ALL,1,1,0,99,99,99
-SR-52,3,2035,ALL,1,1,0,99,99,99
-SR-78,3,2035,ALL,1,1,0,99,99,99
-SR-94,3,2035,ALL,1,1,0,99,99,99
-SR-125,3,2035,ALL,1,1,0,99,99,99
+I-15,3,2035,ALL,1,0.5,0,99,99,99
+SR-15,3,2035,ALL,1,0.5,0,99,99,99
+SR-52,3,2035,ALL,1,0.5,0,99,99,99
+SR-78,3,2035,ALL,1,0.5,0,99,99,99
+SR-94,3,2035,ALL,1,0.5,0,99,99,99
+SR-125,3,2035,ALL,1,0.5,0,99,99,99
 SR-125,4,2035,ALL,1,1,1,1,1.03,2.33
-SR-163,3,2035,ALL,1,1,0,99,99,99
-I-805,3,2035,ALL,1,1,0,99,99,99
-SR-56,3,2035,ALL,1,1,0,99,99,99
-I-5,3,2040,ALL,1,1,0,99,99,99
-I-8,3,2040,ALL,1,1,0,99,99,99
+SR-163,3,2035,ALL,1,0.5,0,99,99,99
+I-805,3,2035,ALL,1,0.5,0,99,99,99
+SR-56,3,2035,ALL,1,0.5,0,99,99,99
+I-5,3,2040,ALL,1,0.5,0,99,99,99
+I-8,3,2040,ALL,1,0.5,0,99,99,99
 SR-11,4,2040,ALL,1,1,1,1,1.03,2.33
-I-15,3,2040,ALL,1,1,0,99,99,99
-SR-15,3,2040,ALL,1,1,0,99,99,99
-SR-52,3,2040,ALL,1,1,0,99,99,99
-SR-78,3,2040,ALL,1,1,0,99,99,99
-SR-94,3,2040,ALL,1,1,0,99,99,99
-SR-125,3,2040,ALL,1,1,0,99,99,99
+I-15,3,2040,ALL,1,0.5,0,99,99,99
+SR-15,3,2040,ALL,1,0.5,0,99,99,99
+SR-52,3,2040,ALL,1,0.5,0,99,99,99
+SR-78,3,2040,ALL,1,0.5,0,99,99,99
+SR-94,3,2040,ALL,1,0.5,0,99,99,99
+SR-125,3,2040,ALL,1,0.5,0,99,99,99
 SR-125,4,2040,ALL,1,1,1,1,1.03,2.33
-SR-163,3,2040,ALL,1,1,0,99,99,99
-I-805,3,2040,ALL,1,1,0,99,99,99
-SR-56,3,2040,ALL,1,1,0,99,99,99
-I-5,3,2050,ALL,1,1,0,99,99,99
-I-8,3,2050,ALL,1,1,0,99,99,99
+SR-163,3,2040,ALL,1,0.5,0,99,99,99
+I-805,3,2040,ALL,1,0.5,0,99,99,99
+SR-56,3,2040,ALL,1,0.5,0,99,99,99
+I-5,3,2050,ALL,1,0.5,0,99,99,99
+I-8,3,2050,ALL,1,0.5,0,99,99,99
 SR-11,4,2050,ALL,1,1,1,1,1.03,2.33
-I-15,3,2050,ALL,1,1,0,99,99,99
-SR-15,3,2050,ALL,1,1,0,99,99,99
-SR-52,3,2050,ALL,1,1,0,99,99,99
-SR-54,3,2050,ALL,1,1,0,99,99,99
-SR-56,3,2050,ALL,1,1,0,99,99,99
-SR-78,3,2050,ALL,1,1,0,99,99,99
-SR-94,3,2050,ALL,1,1,0,99,99,99
-SR-125,3,2050,ALL,1,1,0,99,99,99
-SR-163,3,2050,ALL,1,1,0,99,99,99
-I-805,3,2050,ALL,1,1,0,99,99,99
-SR-905,3,2050,ALL,1,1,0,99,99,99
-SR13,3,2050,ALL,1,1,0,99,99,99
+I-15,3,2050,ALL,1,0.5,0,99,99,99
+SR-15,3,2050,ALL,1,0.5,0,99,99,99
+SR-52,3,2050,ALL,1,0.5,0,99,99,99
+SR-54,3,2050,ALL,1,0.5,0,99,99,99
+SR-56,3,2050,ALL,1,0.5,0,99,99,99
+SR-78,3,2050,ALL,1,0.5,0,99,99,99
+SR-94,3,2050,ALL,1,0.5,0,99,99,99
+SR-125,3,2050,ALL,1,0.5,0,99,99,99
+SR-163,3,2050,ALL,1,0.5,0,99,99,99
+I-805,3,2050,ALL,1,0.5,0,99,99,99
+SR-905,3,2050,ALL,1,0.5,0,99,99,99