diff --git a/hub/data/energy_systems/montreal_custom_systems.xml b/hub/data/energy_systems/montreal_custom_systems.xml
index b9eaee8e..ed657e5a 100644
--- a/hub/data/energy_systems/montreal_custom_systems.xml
+++ b/hub/data/energy_systems/montreal_custom_systems.xml
@@ -108,6 +108,18 @@
                 <dissipation_id>1</dissipation_id>
             </equipments>
         </system>
+        <system id = "16">
+            <name>Unitary air conditioner with baseboard heater electrical boiler</name>
+            <demands>
+                <demand>heating</demand>
+                <demand>domestic_hot_water</demand>
+            </demands>
+            <equipments>
+                <generation_id>2</generation_id>
+                <distribution_id>1</distribution_id>
+                <dissipation_id>1</dissipation_id>
+            </equipments>
+        </system>
         <system id = "2">
             <name>4 pipe fan coils with fuel fired boiler</name>
             <demands>
@@ -275,25 +287,25 @@
         <system_cluster name="system 1 gas">
             <systems>
                 <system_id>1</system_id>
-                <system_id>7</system_id>
+                <system_id>10</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 1 gas pv">
             <systems>
                 <system_id>1</system_id>
-                <system_id>7</system_id>
+                <system_id>10</system_id>
                 <system_id>15</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 1 electricity">
             <systems>
-                <system_id>1</system_id>
+                <system_id>16</system_id>
                 <system_id>10</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 1 electricity pv">
             <systems>
-                <system_id>2</system_id>
+                <system_id>16</system_id>
                 <system_id>10</system_id>
                 <system_id>15</system_id>
             </systems>