diff --git a/NAERSTADMO.py b/NAERSTADMO.py
index b96413d0e639e833e9fddb6b42698469c01ef02a..05eb2af24b23a3c201fe04fef9e803314f93e749 100644
--- a/NAERSTADMO.py
+++ b/NAERSTADMO.py
@@ -84,7 +84,7 @@ def create_dataset():
 
 def create_warning_status(start_date):
     
-    risk_files = glob.glob(f"{outtmp_path}/final_*.nc")
+    risk_files = glob.glob(f"{outfile_path}/RISK_*.nc")
     
     # Classifying warning status for the WHS model
     # 0  == RISK            --> Grey
@@ -98,7 +98,7 @@ def create_warning_status(start_date):
       
         subprocess.run(f'cdo -aexpr,"WARNING_STATUS = RISK < 0 ? 0 : -1; WARNING_STATUS = RISK <= 1 && WARNING_STATUS == -1 ? 2 : WARNING_STATUS; WARNING_STATUS = RISK <= 2.5 && WARNING_STATUS == -1 ? 3 : WARNING_STATUS;WARNING_STATUS = RISK >= 2.5 && WARNING_STATUS == -1 ? 4 : WARNING_STATUS" -timmax {file} {tmpfile_path}result_unmasked.nc', shell=True)
         file_name = os.path.basename(file)
-        file_date = file_name[file_name.index("final_")+6:file_name.index("final_")+16]
+        file_date = file_name[file_name.index("RISK_result_")+12:file_name.index("RISK_result_")+22]
     
         timestep_dates.append(file_date)
         # Mask results using a CSV file with polygons