diff --git a/SimulationClass.py b/SimulationClass.py
index 3be3191ddc5866a60db31e59ff13b9a39685303b..a71b99897d61552c08152ea0ef0f673d4e288108 100755
--- a/SimulationClass.py
+++ b/SimulationClass.py
@@ -47,7 +47,7 @@ def process_short_name(freq, short_name, simulation, experiment, file_manager):
 @timing_decorator
 def process_simulation(experiment, simulation_path):
 
-    frequencies = ["03-Daily"]
+    frequencies = ["02-6Hourly"]
 
     # Should create the Simulation Class
     portfolio = generate_portfolio.generate_portfolio(simulation_path, frequencies)
diff --git a/filename_utils.py b/filename_utils.py
index c569058c1e4f44af769607ad40872d50a6b8c2bb..ce23c40578cd525190453a182b49a54762c36478 100755
--- a/filename_utils.py
+++ b/filename_utils.py
@@ -28,9 +28,12 @@ def create_start_and_end_date(freq, end_date):
         start_date_final = start_date_final.strftime("%Y%m%d")
     else:
         end_date_aux = str(end_date)
-        dt = datetime.strptime(end_date_aux, "%Y%m%d%h")
+        dt = datetime.strptime(end_date_aux, "%Y%m%d%H")
+        end_date_final = dt - relativedelta(hours=6)           # Only valid for 6 hourly output
+        end_date_final = end_date_final.strftime("%Y%m%d%H")
+
         start_date_final = dt - relativedelta(months=6)
-        start_date_final = start_date_final.strftime("%Y%m%d%h")
+        start_date_final = start_date_final.strftime("%Y%m%d%H")
 
     return start_date_final, end_date_final