diff --git a/Model_Library b/Model_Library
index 9042929438be53ee56525dcb37e81cd20ce61d24..d9688f0d6d0517b83e4bd32a31643f7bec34a60e 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit 9042929438be53ee56525dcb37e81cd20ce61d24
+Subproject commit d9688f0d6d0517b83e4bd32a31643f7bec34a60e
diff --git a/Tooling b/Tooling
index d923691784aa93a130ab5571ee77253c54156196..53448a241ccb063a8bd499bc4640cc7805df3f30 160000
--- a/Tooling
+++ b/Tooling
@@ -1 +1 @@
-Subproject commit d923691784aa93a130ab5571ee77253c54156196
+Subproject commit 53448a241ccb063a8bd499bc4640cc7805df3f30
diff --git a/runme.py b/runme.py
index afd6e9b90e52a2525b59778722973c96d0ae9262..1ead2197589d2d2c5d0a03dde527f9a74edbda2f 100644
--- a/runme.py
+++ b/runme.py
@@ -60,15 +60,18 @@ input_profiles = Tooling.input_profile_processor.input_profile_processor.process
 # 'topology_path': path to directory that contains the matrices that define the prosumer topology
 prosumer_dict = {'SCN2_CAT1_PV11_3000_6000':{'config_path': 'input_files/models/prosumer_models/SCN2_CAT1_PV11/config.csv',
                                              'topology_path': 'input_files/models/prosumer_models/SCN2_CAT1_PV11',
-                                             'profiles': {'pv_roof': ['irradiance_1', 'temperature_1'],
-                                                          'elec_cns': 'demand_electric_1',
-                                                          'therm_cns': 'demand_heat_1',
-                                                          'dhw_dmd': 'demand_hot_water_1'}},
+                                             'profiles': {'pv_roof': [['irradiance_1', 'irradiance', 'time_forward'],['temperature_1', 'temperature', 'time_forward']],
+                                                          'elec_cns': ['demand_electric_1', 'demand_electric', 'time_forward'],
+                                                          'therm_cns': ['demand_heat_1', 'demand_heat', 'time_forward'],
+                                                          'dhw_dmd': ['demand_hot_water_1', 'demand_hot_water', 'time_forward']}},
                  'SCN0_CAT1_3000_6000': {'config_path': 'input_files/models/prosumer_models/SCN0_CAT1/config.csv',
                                          'topology_path': 'input_files/models/prosumer_models/SCN0_CAT1',
-                                         'profiles': {'elec_cns': 'demand_electric_2',
-                                                      'therm_cns': 'demand_heat_2',
-                                                      'dhw_dmd': 'demand_hot_water_2'}}}
+                                         'profiles': {'elec_cns': ['demand_electric_2', 'demand_electric', 'same_as_last_day'],
+                                                      'therm_cns': ['demand_heat_2', 'demand_heat', 'same_as_last_day'],
+                                                      'dhw_dmd': ['demand_hot_water_2', 'demand_hot_water', 'same_as_last_day']}}}
+
+# [['irradiance_1', 'irradiance', 'same_as_last_day'],['temperature_1', 'temperature', 'time_forward']]
+# ['demand_electric_1', 'demand_electric', 'same_as_last_week']
 
 prosumer_main = main_prosumer.ProsumerMain(prosumer_dict, input_profiles, t_horizon, t_step)
 
@@ -84,7 +87,7 @@ if simulation_scope == SimulationScope.PROSUMER:
 
 district_assets_dict = {'da_bat': {'config_path': 'input_files/models/district_models/example_CA/config.csv',
                                    'topology_path': 'input_files/models/district_models/example_CA',
-                                   'profiles': {'elec_cns': 'demand_electric_3'}}}
+                                   'profiles': {'elec_cns': ['demand_electric_3', 'demand_electric', 'same_as_last_day']}}}
 
 district_assets = main_prosumer.DistrictAssetMain(district_assets_dict, input_profiles, t_horizon, t_step).district_assets