diff --git a/base_case_modelling.py b/base_case_modelling.py
index 657dde38..056e843a 100644
--- a/base_case_modelling.py
+++ b/base_case_modelling.py
@@ -29,14 +29,14 @@ ConstructionFactory('nrcan', city).enrich()
 UsageFactory('nrcan', city).enrich()
 WeatherFactory('epw', city).enrich()
 ResultFactory('energy_plus_multiple_buildings', city, ep_output_path).enrich()
+# for building in city.buildings:
+#   building.energy_systems_archetype_name = 'system 7 electricity pv'
+# EnergySystemsFactory('montreal_custom', city).enrich()
 for building in city.buildings:
-  building.energy_systems_archetype_name = 'system 1 gas'
-EnergySystemsFactory('montreal_custom', city).enrich()
-# for building in city.buildings:
-#   building.energy_systems_archetype_name = 'PV+4Pipe+DHW'
-# EnergySystemsFactory('montreal_future', city).enrich()
-# for building in city.buildings:
-#   EnergySystemsSimulationFactory('archetype13', building=building, output_path=output_path).enrich()
+  building.energy_systems_archetype_name = 'PV+4Pipe+DHW'
+EnergySystemsFactory('montreal_future', city).enrich()
+for building in city.buildings:
+  EnergySystemsSimulationFactory('archetype13', building=building, output_path=output_path).enrich()
 month_names = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
 building_data = {}
 for building in city.buildings:
@@ -49,19 +49,32 @@ for building in city.buildings:
                                                   building.cooling_consumption[cte.YEAR][0] / 3.6e6,
                                                 'yearly_dhw_consumption_kWh':
                                                   building.domestic_hot_water_consumption[cte.YEAR][0] / 3.6e6,
+                                                'yearly_appliance_electricity_consumption_kWh':
+                                                  building.appliances_electrical_demand[cte.YEAR][0] / 3.6e6,
+                                                'yearly_lighting_electricity_consumption_kWh':
+                                                  building.lighting_electrical_demand[cte.YEAR][0] / 3.6e6,
                                                 'heating_peak_load_kW': max(
                                                   building.heating_consumption[cte.HOUR]) / 3.6e6,
                                                 'cooling_peak_load_kW': max(
                                                   building.cooling_consumption[cte.HOUR]) / 3.6e6,
+                                                'monthly_heating_demand':
+                                                  {month_name: building.heating_demand[cte.MONTH][i] / 3.6e6
+                                                   for (i, month_name) in enumerate(month_names)},
                                                 'monthly_heating_consumption_kWh':
                                                   {month_name: building.heating_consumption[cte.MONTH][i] / 3.6e6
                                                    for (i, month_name) in enumerate(month_names)},
+                                                'monthly_cooling_demand_kWh':
+                                                  {month_name: building.cooling_demand[cte.MONTH][i] / 3.6e6
+                                                   for (i, month_name) in enumerate(month_names)},
                                                 'monthly_cooling_consumption_kWh':
                                                   {month_name: building.cooling_consumption[cte.MONTH][i] / 3.6e6
                                                    for (i, month_name) in enumerate(month_names)},
+                                                'monthly_dhw_demand_kWh':
+                                                  {month_name: building.domestic_hot_water_heat_demand[cte.MONTH][i] / 3.6e6
+                                                   for (i, month_name) in enumerate(month_names)},
                                                 'monthly_dhw_consumption_kWh':
                                                   {month_name: building.domestic_hot_water_consumption[cte.MONTH][i] /
                                                                3.6e6 for (i, month_name) in enumerate(month_names)}}
 
-with open(output_path / "base_case_buildings_data.json", "w") as json_file:
+with open(output_path / "air_to_water_hp_buildings_data.json", "w") as json_file:
   json.dump(building_data, json_file, indent=4)
diff --git a/hub/data/energy_systems/montreal_custom_systems.xml b/hub/data/energy_systems/montreal_custom_systems.xml
index 9d452c5d..258fe86a 100644
--- a/hub/data/energy_systems/montreal_custom_systems.xml
+++ b/hub/data/energy_systems/montreal_custom_systems.xml
@@ -198,7 +198,7 @@
             <equipments>
                 <generation_id>3</generation_id>
                 <distribution_id>8</distribution_id>
-g            </equipments>
+           </equipments>
         </system>
         <system id="5">
             <name>Single zone packaged rooftop unit with electrical resistance furnace and baseboards and fuel boiler for acs</name>