diff --git a/Utilities/Matlab/CFAST_validation_dataplot_inputs.csv b/Utilities/Matlab/CFAST_validation_dataplot_inputs.csv
index 5298d82bd..e63d9518c 100644
--- a/Utilities/Matlab/CFAST_validation_dataplot_inputs.csv
+++ b/Utilities/Matlab/CFAST_validation_dataplot_inputs.csv
@@ -36,8 +36,8 @@ d,s,DelCo Trainers,DelCo_Trainers/Test_23_Floor_1_HGL.csv,1,2,Time,T_upper,Exp (
 d,s,DelCo Trainers,DelCo_Trainers/Test_23_Floor_2_HGL.csv,1,2,Time,T_upper,Exp (T\_upper),k-,0,10000,,0,10000,32,DelCo_Trainers/Test_23_compartments.csv,1,5,Time,ULT_6,CFAST (ULT\_6),k--,0,10000,,0,10000,32,"HGL Temperature, Test 23, Floor 2",Time (min),Temperature ($^\circ$C),0,20,60,0,200,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_23_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_23_HGL_Temp_Floor_2,HGL Temperature: Natural Ventilation|HGL Temperature,max,0,DelCo Trainers,go,g
 d,s,DelCo Trainers,DelCo_Trainers/Test_24_Floor_1_HGL.csv,1,2,Time,T_upper,Exp (T\_upper),k-,0,10000,,0,10000,32,DelCo_Trainers/Test_24_compartments.csv,1,5,Time,ULT_1,CFAST (ULT\_1),k--,0,10000,,0,10000,32,"HGL Temperature, Test 24, Floor 1",Time (min),Temperature ($^\circ$C),0,20,60,0,400,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_24_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_24_HGL_Temp_Floor_1,HGL Temperature: Natural Ventilation|HGL Temperature,max,0,DelCo Trainers,go,g
 d,s,DelCo Trainers,DelCo_Trainers/Test_24_Floor_2_HGL.csv,1,2,Time,T_upper,Exp (T\_upper),k-,0,10000,,0,10000,32,DelCo_Trainers/Test_24_compartments.csv,1,5,Time,ULT_6,CFAST (ULT\_6),k--,0,10000,,0,10000,32,"HGL Temperature, Test 24, Floor 2",Time (min),Temperature ($^\circ$C),0,20,60,0,200,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_24_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_24_HGL_Temp_Floor_2,HGL Temperature: Natural Ventilation|HGL Temperature,max,0,DelCo Trainers,go,g
-s,s,DelCo Trainers,DelCo_Trainers/Test_25_Floor_1_HGL.csv,1,2,Time,T_upper,Exp (T\_upper),k-,0,10000,,0,10000,32,DelCo_Trainers/Test_25_compartments.csv,1,5,Time,ULT_1,CFAST (ULT\_1),k--,0,10000,,0,10000,32,"HGL Temperature, Test 25, Floor 1",Time (min),Temperature ($^\circ$C),0,20,60,0,400,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_25_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_25_HGL_Temp_Floor_1,HGL Temperature: Natural Ventilation|HGL Temperature,max,0,DelCo Trainers,go,g
-s,s,DelCo Trainers,DelCo_Trainers/Test_25_Floor_2_HGL.csv,1,2,Time,T_upper,Exp (T\_upper),k-,0,10000,,0,10000,32,DelCo_Trainers/Test_25_compartments.csv,1,5,Time,ULT_6,CFAST (ULT\_6),k--,0,10000,,0,10000,32,"HGL Temperature, Test 25, Floor 2",Time (min),Temperature ($^\circ$C),0,20,60,0,200,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_25_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_25_HGL_Temp_Floor_2,HGL Temperature: Natural Ventilation|HGL Temperature,max,0,DelCo Trainers,go,g
+d,s,DelCo Trainers,DelCo_Trainers/Test_25_Floor_1_HGL.csv,1,2,Time,T_upper,Exp (T\_upper),k-,0,10000,,0,10000,32,DelCo_Trainers/Test_25_compartments.csv,1,5,Time,ULT_1,CFAST (ULT\_1),k--,0,10000,,0,10000,32,"HGL Temperature, Test 25, Floor 1",Time (min),Temperature ($^\circ$C),0,20,60,0,400,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_25_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_25_HGL_Temp_Floor_1,HGL Temperature: Natural Ventilation|HGL Temperature,max,0,DelCo Trainers,go,g
+d,s,DelCo Trainers,DelCo_Trainers/Test_25_Floor_2_HGL.csv,1,2,Time,T_upper,Exp (T\_upper),k-,0,10000,,0,10000,32,DelCo_Trainers/Test_25_compartments.csv,1,5,Time,ULT_6,CFAST (ULT\_6),k--,0,10000,,0,10000,32,"HGL Temperature, Test 25, Floor 2",Time (min),Temperature ($^\circ$C),0,20,60,0,200,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_25_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_25_HGL_Temp_Floor_2,HGL Temperature: Natural Ventilation|HGL Temperature,max,0,DelCo Trainers,go,g
 s,s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 d,s,FM/NBS,FM_NBS/fm19.csv,1,5,C123,C114,Exp (T\_Upper),k-,0,10000,,180,10000,21.7,FM_NBS/FM19_compartments.csv,1,5,Time,ULT_1,CFAST (ULT\_1),k--,0,10000,,0,10000,21,"HGL Temperature, FM/NBS Test 19",Time (min),Temperature ($^\circ$C),0,10,60,0,400,1,no,"0.05,0.90",SouthEast,,1,FM_NBS/FM19_git.txt,linear,SCRIPT_FIGURES/FM_NBS/FM19_1_HGL_Temp,HGL Temperature: Forced Ventilation|HGL Temperature,max,0,FM/NBS,g^,w
 d,s,FM/NBS,FM_NBS/fm19.csv,1,5,C123,C115|C116|C117,Exp (T\_Upper\_Near)|Exp (T\_Upper\_Middle)|Exp (T\_Upper\_Far),k-|r-|g-,0,10000,,180,10000,16.76666667,FM_NBS/FM19_compartments.csv,1,5,Time,ULT_2|ULT_2|ULT_2,CFAST (ULT\_2)|CFAST (ULT\_2)|CFAST (ULT\_2),k--|r--|g--,0,10000,,0,10000,21,"HGL Temperature, FM/NBS Test 19",Time (min),Temperature ($^\circ$C),0,10,60,0,120,1,no,"0.05,0.90",SouthEast,,1,FM_NBS/FM19_git.txt,linear,SCRIPT_FIGURES/FM_NBS/FM19_2_HGL_Temp,HGL Temperature: Forced Ventilation|HGL Temperature,max,0,FM/NBS,g^,w
@@ -668,8 +668,8 @@ d,,DelCo Trainers,DelCo_Trainers/Test_23.csv,1,3,Time,TC_A1_1|TC_A2_1|TC_A3_1,Ex
 d,,DelCo Trainers,DelCo_Trainers/Test_23.csv,1,3,Time,TC_A7_1|TC_A8_1|TC_A9_1,Exp (TC\_A7\_1)|Exp (TC\_A8\_1)|Exp (TC\_A9\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_23_devices.csv,1,5,Time,TRGGAST_4|TRGGAST_5|TRGGAST_6,CFAST (Targ 4)|CFAST (Targ 5)|CFAST (Targ 6),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 23, A7, A8, A9",Time (min),Temperature ($^\circ$C),0,20,60,0,300,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_23_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_23_A7_A8_A9_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
 d,,DelCo Trainers,DelCo_Trainers/Test_24.csv,1,3,Time,TC_A1_1|TC_A2_1|TC_A3_1,Exp (TC\_A1\_1)|Exp (TC\_A2\_1)|Exp (TC\_A3\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_24_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_2|TRGGAST_3,CFAST (Targ 1)|CFAST (Targ 2)|CFAST (Targ 3),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 24, A1, A2, A3",Time (min),Temperature ($^\circ$C),0,20,60,0,600,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_24_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_24_A1_A2_A3_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
 d,,DelCo Trainers,DelCo_Trainers/Test_24.csv,1,3,Time,TC_A7_1|TC_A8_1|TC_A9_1,Exp (TC\_A7\_1)|Exp (TC\_A8\_1)|Exp (TC\_A9\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_24_devices.csv,1,5,Time,TRGGAST_4|TRGGAST_5|TRGGAST_6,CFAST (Targ 4)|CFAST (Targ 5)|CFAST (Targ 6),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 24, A7, A8, A9",Time (min),Temperature ($^\circ$C),0,20,60,0,300,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_24_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_24_A7_A8_A9_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-s,,DelCo Trainers,DelCo_Trainers/Test_25.csv,1,3,Time,TC_A1_1|TC_A2_1|TC_A3_1,Exp (TC\_A1\_1)|Exp (TC\_A2\_1)|Exp (TC\_A3\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_25_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_2|TRGGAST_3,CFAST (Targ 1)|CFAST (Targ 2)|CFAST (Targ 3),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 25, A1, A2, A3",Time (min),Temperature ($^\circ$C),0,20,60,0,600,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_25_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_25_A1_A2_A3_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-s,,DelCo Trainers,DelCo_Trainers/Test_25.csv,1,3,Time,TC_A7_1|TC_A8_1|TC_A9_1,Exp (TC\_A7\_1)|Exp (TC\_A8\_1)|Exp (TC\_A9\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_25_devices.csv,1,5,Time,TRGGAST_4|TRGGAST_5|TRGGAST_6,CFAST (Targ 4)|CFAST (Targ 5)|CFAST (Targ 6),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 25, A7, A8, A9",Time (min),Temperature ($^\circ$C),0,20,60,0,300,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_25_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_25_A7_A8_A9_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,,DelCo Trainers,DelCo_Trainers/Test_25.csv,1,3,Time,TC_A1_1|TC_A2_1|TC_A3_1,Exp (TC\_A1\_1)|Exp (TC\_A2\_1)|Exp (TC\_A3\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_25_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_2|TRGGAST_3,CFAST (Targ 1)|CFAST (Targ 2)|CFAST (Targ 3),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 25, A1, A2, A3",Time (min),Temperature ($^\circ$C),0,20,60,0,600,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_25_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_25_A1_A2_A3_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,,DelCo Trainers,DelCo_Trainers/Test_25.csv,1,3,Time,TC_A7_1|TC_A8_1|TC_A9_1,Exp (TC\_A7\_1)|Exp (TC\_A8\_1)|Exp (TC\_A9\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_25_devices.csv,1,5,Time,TRGGAST_4|TRGGAST_5|TRGGAST_6,CFAST (Targ 4)|CFAST (Targ 5)|CFAST (Targ 6),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 25, A7, A8, A9",Time (min),Temperature ($^\circ$C),0,20,60,0,300,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_25_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_25_A7_A8_A9_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
 s,s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 d,d,FM/SNL,FM_SNL/FM_SNL_Test_1_TC.csv,1,3,TIME,1|11,Exp (1/(0.98 H))|Exp (11/(0.98 H)),k-|r-,0,10000,,0,10000,20,FM_SNL/FMSNL_1_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_3,CFAST (Targ 2)|CFAST (Targ 3),k--|r--,0,10000,,0,10000,20,"Ceiling Jet Temperature, FM/SNL Test 1",Time (min),Temperature ($^\circ$C),0,30,60,0,250,1,no,"0.05,0.90",SouthEast,,1,FM_SNL/FMSNL_1_git.txt,linear,SCRIPT_FIGURES/FM_SNL/FM_SNL_01_Ceiling_Jet,Ceiling Jet Temperature,max,0,FM/SNL,g^,g
 d,d,FM/SNL,FM_SNL/FM_SNL_Test_2_TC.csv,1,3,TIME,1|11,Exp (1/(0.98 H))|Exp (11/(0.98 H)),k-|r-,0,10000,,0,10000,20,FM_SNL/FMSNL_2_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_3,CFAST (Targ 2)|CFAST (Targ 3),k--|r--,0,10000,,0,10000,20,"Ceiling Jet Temperature, FM/SNL Test 2",Time (min),Temperature ($^\circ$C),0,30,60,0,250,1,no,"0.05,0.90",SouthEast,,1,FM_SNL/FMSNL_2_git.txt,linear,SCRIPT_FIGURES/FM_SNL/FM_SNL_02_Ceiling_Jet,Ceiling Jet Temperature,max,0,FM/SNL,g^,g
diff --git a/Validation/DelCo_Trainers/Test_24.in b/Validation/DelCo_Trainers/Test_24.in
index 6f9d9d707..8142cd111 100644
--- a/Validation/DelCo_Trainers/Test_24.in
+++ b/Validation/DelCo_Trainers/Test_24.in
@@ -67,7 +67,7 @@
 &VENT TYPE = 'WALL' ID = 'Second Floor South Door A11' COMP_IDS = 'Floor 2 Hallway' 'OUTSIDE'  TOP = 2, BOTTOM = 0, WIDTH = 0.9
   CRITERION = 'TIME' T = 0, 452, 453, 502, 503 F = 1, 1, 0, 0, 1 FACE = 'LEFT' OFFSET = 0.15 /
 &VENT TYPE = 'WALL' ID = 'Second Floor West Double Door A13' COMP_IDS = 'Floor 2 North Room Front' 'OUTSIDE'  TOP = 2, BOTTOM = 0, WIDTH = 0.9
-  CRITERION = 'TIME' T = 0, 130, 131 F = 0, 0, 1 FACE = 'RIGHT' OFFSET = 3.1 /
+  CRITERION = 'TIME' T = 0, 383, 384 F = 0, 0, 1 FACE = 'RIGHT' OFFSET = 3.1 /
 &VENT TYPE = 'WALL' ID = 'Second Floor East Double Door A14' COMP_IDS = 'Floor 2 North Room Front' 'OUTSIDE'  TOP = 2, BOTTOM = 0, WIDTH = 0.9
   CRITERION = 'TIME' T = 0, 877, 878 F = 0, 0, 1 FACE = 'RIGHT' OFFSET = 2.2 /
 &VENT TYPE = 'WALL' ID = 'Floor 2 Stairwell Door' COMP_IDS = 'Stairwell', 'Floor 2 North Room Front' TOP = 4.4, BOTTOM = 2.4, WIDTH = 0.9
diff --git a/Validation/DelCo_Trainers/Test_25.in b/Validation/DelCo_Trainers/Test_25.in
new file mode 100644
index 000000000..e3f901d11
--- /dev/null
+++ b/Validation/DelCo_Trainers/Test_25.in
@@ -0,0 +1,125 @@
+&HEAD VERSION = 7600, TITLE = 'CFAST Simulation' /
+ 
+!! Scenario Configuration 
+&TIME SIMULATION = 960 PRINT = 60 SMOKEVIEW = 15 SPREADSHEET = 15 / 
+&INIT PRESSURE = 101325 RELATIVE_HUMIDITY = 50 INTERIOR_TEMPERATURE = 32 EXTERIOR_TEMPERATURE = 32 /
+&MISC  LOWER_OXYGEN_LIMIT = 0.15 / 
+ 
+!! Material Properties 
+&MATL ID = 'Concrete' MATERIAL = 'Concrete (NBS88-3752)', 
+      CONDUCTIVITY = 1.8 DENSITY = 2280 SPECIFIC_HEAT = 1.04, THICKNESS = 0.61 EMISSIVITY = 0.9 /
+&MATL ID = 'TC' MATERIAL = 'Thermocouple (small steel target for plume temp)', 
+      CONDUCTIVITY = 54 DENSITY = 7850 SPECIFIC_HEAT = 0.425, THICKNESS = 0.001 EMISSIVITY = 0.95 /
+&MATL ID = 'FiberCem' MATERIAL = 'Fiber Cement', 
+      CONDUCTIVITY = 0.15 DENSITY = 1300 SPECIFIC_HEAT = 1, THICKNESS = 0.013 EMISSIVITY = 0.9 /
+&MATL ID = 'Gypsum' MATERIAL = 'Gypsum (NBSIR 88-3752)', 
+      CONDUCTIVITY = 1.8 DENSITY = 650 SPECIFIC_HEAT = 1.09, THICKNESS = 0.03 EMISSIVITY = 0.9 /
+ 
+!! Compartments 
+&COMP ID = 'Floor 1'
+      DEPTH = 5.8 HEIGHT = 2.4 WIDTH = 10.7
+      CEILING_MATL_ID = 'FiberCem' CEILING_THICKNESS = 0.013 WALL_MATL_ID = 'FiberCem', 'Gypsum', 'Concrete' WALL_THICKNESS = 0.013, 0.013, 0.6 FLOOR_MATL_ID = 'FiberCem', 'Gypsum', 'Concrete' FLOOR_THICKNESS = 0.013, 0.03, 0.61
+      ORIGIN = 0.6, 1.5, 0 GRID = 50, 50, 50 LEAK_AREA_RATIO = 0, 0.000407855 /
+&COMP ID = 'Floor 1 Vestibule'
+      DEPTH = 0.9 HEIGHT = 2.4 WIDTH = 0.9
+      CEILING_MATL_ID = 'FiberCem' CEILING_THICKNESS = 0.013 WALL_MATL_ID = 'FiberCem', 'Gypsum', 'Concrete' WALL_THICKNESS = 0.013, 0.013, 0.6 FLOOR_MATL_ID = 'FiberCem', 'Gypsum', 'Concrete' FLOOR_THICKNESS = 0.013, 0.03, 0.61
+      ORIGIN = 0.6, 0.6, 0 GRID = 50, 50, 50 LEAK_AREA_RATIO = 0, 0.000407855 /
+&COMP ID = 'Stairwell'
+      DEPTH = 0.9 HEIGHT = 4.8 WIDTH = 3.7
+      CEILING_MATL_ID = 'FiberCem' CEILING_THICKNESS = 0.013 WALL_MATL_ID = 'FiberCem', 'Gypsum', 'Concrete' WALL_THICKNESS = 0.013, 0.013, 0.6 FLOOR_MATL_ID = 'FiberCem', 'Gypsum', 'Concrete' FLOOR_THICKNESS = 0.013, 0.03, 0.61
+      CROSS_SECT_AREAS = 0.63, 3.33, 3.33
+      CROSS_SECT_HEIGHTS = 0, 2.4, 4.8
+      ORIGIN = 1.5, 0.6, 0 GRID = 50, 50, 50 LEAK_AREA_RATIO = 0, 0.000407855 /
+&COMP ID = 'Floor 2 Nook'
+      DEPTH = 1.2 HEIGHT = 2.4 WIDTH = 0.9
+      CEILING_MATL_ID = 'FiberCem', 'FiberCem' CEILING_THICKNESS = 0.013, 0.013 WALL_MATL_ID = 'Gypsum', 'FiberCem' WALL_THICKNESS = 0.026, 0.013 FLOOR_MATL_ID = 'FiberCem' FLOOR_THICKNESS = 0.013
+      ORIGIN = 0.6, 0.6, 2.4 GRID = 50, 50, 50 LEAK_AREA_RATIO = 0, 0.000466563 /
+&COMP ID = 'Floor 2 Hallway'
+      DEPTH = 1.2 HEIGHT = 2.4 WIDTH = 4.2
+      CEILING_MATL_ID = 'FiberCem', 'FiberCem' CEILING_THICKNESS = 0.013, 0.013 WALL_MATL_ID = 'Gypsum', 'FiberCem' WALL_THICKNESS = 0.026, 0.013 FLOOR_MATL_ID = 'FiberCem' FLOOR_THICKNESS = 0.013
+      ORIGIN = 0.6, 1.8, 2.4 GRID = 50, 50, 50 LEAK_AREA_RATIO = 0, 0.000466563 /
+&COMP ID = 'Floor 2 North Room Front'
+      DEPTH = 4 HEIGHT = 2.4 WIDTH = 6.7
+      CEILING_MATL_ID = 'FiberCem', 'FiberCem' CEILING_THICKNESS = 0.013, 0.013 WALL_MATL_ID = 'Gypsum', 'FiberCem' WALL_THICKNESS = 0.026, 0.013 FLOOR_MATL_ID = 'FiberCem' FLOOR_THICKNESS = 0.013
+      ORIGIN = 4.8, 0.6, 2.4 GRID = 50, 50, 50 LEAK_AREA_RATIO = 0, 0.000466563 /
+&COMP ID = 'Floor 2 North Room Rear'
+      DEPTH = 2 HEIGHT = 2.4 WIDTH = 5
+      CEILING_MATL_ID = 'FiberCem', 'FiberCem' CEILING_THICKNESS = 0.013, 0.013 WALL_MATL_ID = 'Gypsum', 'FiberCem' WALL_THICKNESS = 0.026, 0.013 FLOOR_MATL_ID = 'FiberCem' FLOOR_THICKNESS = 0.013
+      ORIGIN = 6.5, 4.6, 2.4 GRID = 50, 50, 50 LEAK_AREA_RATIO = 0, 0.000466563 /
+&COMP ID = 'Floor 2 South Room Rear'
+      DEPTH = 2 HEIGHT = 2.4 WIDTH = 5.9
+      CEILING_MATL_ID = 'FiberCem', 'FiberCem' CEILING_THICKNESS = 0.013, 0.013 WALL_MATL_ID = 'Gypsum', 'FiberCem' WALL_THICKNESS = 0.026, 0.013 FLOOR_MATL_ID = 'FiberCem' FLOOR_THICKNESS = 0.013
+      ORIGIN = 0.6, 4.6, 2.4 GRID = 50, 50, 50 LEAK_AREA_RATIO = 0, 0.000466563 /
+&COMP ID = 'Floor 2 South Room Front'
+      DEPTH = 0.9 HEIGHT = 2.4 WIDTH = 2.8
+      CEILING_MATL_ID = 'FiberCem', 'FiberCem' CEILING_THICKNESS = 0.013, 0.013 WALL_MATL_ID = 'Gypsum', 'FiberCem' WALL_THICKNESS = 0.026, 0.013 FLOOR_MATL_ID = 'FiberCem' FLOOR_THICKNESS = 0.013
+      ORIGIN = 0.6, 3.7, 2.4 GRID = 50, 50, 50 LEAK_AREA_RATIO = 0, 0.000466563 /
+&COMP ID = 'Floor 2 South Room Nook'
+      DEPTH = 0.7 HEIGHT = 2.4 WIDTH = 0.9
+      CEILING_MATL_ID = 'FiberCem', 'FiberCem' CEILING_THICKNESS = 0.013, 0.013 WALL_MATL_ID = 'Gypsum', 'FiberCem' WALL_THICKNESS = 0.026, 0.013 FLOOR_MATL_ID = 'FiberCem' FLOOR_THICKNESS = 0.013
+      ORIGIN = 2.5, 3, 2.4 GRID = 50, 50, 50 LEAK_AREA_RATIO = 0, 0.000466563 /
+ 
+!! Wall Vents
+&VENT TYPE = 'WALL' ID = 'First Floor East Double Door A6' COMP_IDS = 'Floor 1' 'OUTSIDE'  TOP = 2, BOTTOM = 0, WIDTH = 0.9
+  CRITERION = 'TIME' T = 0, 836, 837 F = 0, 0, 1 FACE = 'RIGHT' OFFSET = 1.1 /
+&VENT TYPE = 'WALL' ID = 'First Floor West Double Door A5' COMP_IDS = 'Floor 1' 'OUTSIDE'  TOP = 2, BOTTOM = 0, WIDTH = 0.9
+  CRITERION = 'TIME' T = 0, 244, 245 F = 0, 0, 1 FACE = 'RIGHT' OFFSET = 2 /
+&VENT TYPE = 'WALL' ID = 'Second Floor South Door A11' COMP_IDS = 'Floor 2 Hallway' 'OUTSIDE'  TOP = 2, BOTTOM = 0, WIDTH = 0.9
+  CRITERION = 'TIME' T = 0, 474, 475 F = 0, 0, 1 FACE = 'LEFT' OFFSET = 0.15 /
+&VENT TYPE = 'WALL' ID = 'Second Floor West Double Door A13' COMP_IDS = 'Floor 2 North Room Front' 'OUTSIDE'  TOP = 2, BOTTOM = 0, WIDTH = 0.9
+  CRITERION = 'TIME' T = 0, 353, 354 F = 0, 0, 1 FACE = 'RIGHT' OFFSET = 3.1 /
+&VENT TYPE = 'WALL' ID = 'Second Floor East Double Door A14' COMP_IDS = 'Floor 2 North Room Front' 'OUTSIDE'  TOP = 2, BOTTOM = 0, WIDTH = 0.9
+  CRITERION = 'TIME' T = 0, 930 F = 0, 0 FACE = 'RIGHT' OFFSET = 2.2 /
+&VENT TYPE = 'WALL' ID = 'Floor 2 Stairwell Door' COMP_IDS = 'Stairwell', 'Floor 2 North Room Front' TOP = 4.4, BOTTOM = 2.4, WIDTH = 0.9
+  CRITERION = 'TIME' T = 0, 112, 113 F = 0.19, 0.19, 1 FACE = 'RIGHT' OFFSET = 0 /
+&VENT TYPE = 'WALL' ID = 'Floor 1 Room to Vestibule' COMP_IDS = 'Floor 1', 'Floor 1 Vestibule' TOP = 2.4, BOTTOM = 0, WIDTH = 0.9
+  FACE = 'FRONT' OFFSET = 0 /
+&VENT TYPE = 'WALL' ID = 'Floor 1 Vestibule to Stairwell' COMP_IDS = 'Floor 1 Vestibule', 'Stairwell' TOP = 2.4, BOTTOM = 0, WIDTH = 0.9
+  FACE = 'RIGHT' OFFSET = 0 /
+&VENT TYPE = 'WALL' ID = 'Floor 2 Nook to Hallway' COMP_IDS = 'Floor 2 Nook', 'Floor 2 Hallway' TOP = 2.4, BOTTOM = 0, WIDTH = 0.9
+  FACE = 'REAR' OFFSET = 0 /
+&VENT TYPE = 'WALL' ID = 'Floor 2 Hallway to North Room' COMP_IDS = 'Floor 2 Hallway', 'Floor 2 North Room Front' TOP = 2.4, BOTTOM = 0, WIDTH = 1.2
+  FACE = 'RIGHT' OFFSET = 0 /
+&VENT TYPE = 'WALL' ID = 'FLoor 2 Hallway to South Room' COMP_IDS = 'Floor 2 Hallway', 'Floor 2 South Room Nook' TOP = 2.4, BOTTOM = 0, WIDTH = 0.9
+  FACE = 'REAR' OFFSET = 1.9 /
+&VENT TYPE = 'WALL' ID = 'Floor 2 North Front to Rear' COMP_IDS = 'Floor 2 North Room Front', 'Floor 2 North Room Rear' TOP = 2.4, BOTTOM = 0, WIDTH = 5
+  FACE = 'REAR' OFFSET = 1.7 /
+&VENT TYPE = 'WALL' ID = 'Floor 2 North to South' COMP_IDS = 'Floor 2 North Room Rear', 'Floor 2 South Room Rear' TOP = 2.4, BOTTOM = 0, WIDTH = 1.2
+  FACE = 'LEFT' OFFSET = 0.4 /
+&VENT TYPE = 'WALL' ID = 'Floor South Rear to Front' COMP_IDS = 'Floor 2 South Room Rear', 'Floor 2 South Room Front' TOP = 2.4, BOTTOM = 0, WIDTH = 2.8
+  FACE = 'FRONT' OFFSET = 0 /
+&VENT TYPE = 'WALL' ID = 'Floor 2 South to Nook' COMP_IDS = 'Floor 2 South Room Front', 'Floor 2 South Room Nook' TOP = 2.4, BOTTOM = 0, WIDTH = 0.9
+  FACE = 'FRONT' OFFSET = 1.9 /
+ 
+!! Fires 
+&FIRE ID = 'Corner Burner'  COMP_ID = 'Floor 1', FIRE_ID = 'Propane Fire 1'  LOCATION = 0.9, 5.2 / 
+&FIRE ID = 'Middle Burner'  COMP_ID = 'Floor 1', FIRE_ID = 'Propane Fire 2'  LOCATION = 0.9, 4.6 / 
+&FIRE ID = 'Center Burner'  COMP_ID = 'Floor 1', FIRE_ID = 'Propane Fire 3'  LOCATION = 0.9, 4 / 
+&CHEM ID = 'Propane Fire 1' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
+&TABL ID = 'Propane Fire 1' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
+&TABL ID = 'Propane Fire 1', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 5, 423.3333, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 721, 423.3333, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 747, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&CHEM ID = 'Propane Fire 2' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
+&TABL ID = 'Propane Fire 2' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
+&TABL ID = 'Propane Fire 2', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 5, 423.3333, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 721, 423.3333, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 746, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&CHEM ID = 'Propane Fire 3' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
+&TABL ID = 'Propane Fire 3' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
+&TABL ID = 'Propane Fire 3', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 5, 423.3333, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 721, 423.3333, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 722, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+ 
+!! Devices
+&DEVC ID = 'A1' COMP_ID = 'Floor 1 Vestibule' LOCATION = 0.4, 0.4, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'A2' COMP_ID = 'Floor 1' LOCATION = 3.6, 2, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.6495339, 0.6254771, -0.432301 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'A3' COMP_ID = 'Floor 1' LOCATION = 7.1, 2, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.8909185, 0.373611, -0.2582227 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'A7' COMP_ID = 'Floor 2 South Room Rear' LOCATION = 2.3, 0.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'A8' COMP_ID = 'Floor 2 North Room Rear' LOCATION = 1.92, 0.6, 2.395 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'A9' COMP_ID = 'Floor 2 North Room Front' LOCATION = 3.6, 1.5, 2.395 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+ 
+&TAIL /
diff --git a/Validation/runall.bat b/Validation/runall.bat
index 0f9a90f92..34efdda3f 100755
--- a/Validation/runall.bat
+++ b/Validation/runall.bat
@@ -60,6 +60,7 @@ background -u 98 ..\..\Utilities\for_bundle\Bin\cfast.exe Test_06 -V
 background -u 98 ..\..\Utilities\for_bundle\Bin\cfast.exe Test_22 -V
 background -u 98 ..\..\Utilities\for_bundle\Bin\cfast.exe Test_23 -V
 background -u 98 ..\..\Utilities\for_bundle\Bin\cfast.exe Test_24 -V
+background -u 98 ..\..\Utilities\for_bundle\Bin\cfast.exe Test_25 -V
 cd ..
 if %1==DelCo_Trainers goto end
 
diff --git a/Validation/scripts/CFAST_Cases.sh b/Validation/scripts/CFAST_Cases.sh
index cda16708d..af66c71d7 100755
--- a/Validation/scripts/CFAST_Cases.sh
+++ b/Validation/scripts/CFAST_Cases.sh
@@ -21,6 +21,7 @@ $RUNCFAST -d DelCo_Trainers Test_06.in
 $RUNCFAST -d DelCo_Trainers Test_22.in
 $RUNCFAST -d DelCo_Trainers Test_23.in
 $RUNCFAST -d DelCo_Trainers Test_24.in
+$RUNCFAST -d DelCo_Trainers Test_25.in
 
 $RUNCFAST -d Fleury_Heat_Flux Fleury_1t1_100_kW.in
 $RUNCFAST -d Fleury_Heat_Flux Fleury_1t1_150_kW.in