diff --git a/backend/Property.py b/backend/Property.py
index 98df4ceb..31612a49 100644
--- a/backend/Property.py
+++ b/backend/Property.py
@@ -697,15 +697,19 @@ class Property:
         # Convert to cost
         if self.heating_energy_source == "Electricity":
             adjusted_heating_cost = adjusted_heating_kwh * AnnualBillSavings.ELECTRICITY_PRICE_CAP
+            unadjusted_heating_cost = heating_prediction * AnnualBillSavings.ELECTRICITY_PRICE_CAP
         elif self.heating_energy_source == "Natural Gas":
             adjusted_heating_cost = adjusted_heating_kwh * AnnualBillSavings.GAS_PRICE_CAP
+            unadjusted_heating_cost = heating_prediction * AnnualBillSavings.GAS_PRICE_CAP
         else:
             raise NotImplementedError("Not implemented cost for this fuel type")
 
         if self.hot_water_energy_source == "Electricity":
             adjusted_hot_water_cost = adjusted_hot_water_kwh * AnnualBillSavings.ELECTRICITY_PRICE_CAP
+            unadjusted_hot_water_cost = hot_water_prediction * AnnualBillSavings.ELECTRICITY_PRICE_CAP
         elif self.hot_water_energy_source == "Natural Gas":
             adjusted_hot_water_cost = adjusted_hot_water_kwh * AnnualBillSavings.GAS_PRICE_CAP
+            unadjusted_hot_water_cost = hot_water_prediction * AnnualBillSavings.GAS_PRICE_CAP
         else:
             raise NotImplementedError("Not implemented cost for this fuel type")
 
@@ -725,11 +729,16 @@ class Property:
                 "lighting": adjusted_lighting_cost,
                 "appliances": adjusted_appliances_cost
             },
-            "original": {
+            "unadjusted": {
+                "heating": unadjusted_heating_cost,
+                "hot_water": unadjusted_hot_water_cost,
+                "lighting": float(self.data["lighting-cost-current"]),
+                "appliances": appliances_kwh * AnnualBillSavings.ELECTRICITY_PRICE_CAP
+            },
+            "epc": {
                 "heating": float(self.data["heating-cost-current"]),
                 "hot_water": float(self.data["hot-water-cost-current"]),
                 "lighting": float(self.data["lighting-cost-current"]),
-                "appliances": appliances_kwh
             }
         }
 
@@ -740,7 +749,7 @@ class Property:
                 "lighting": adjusted_lighting_kwh,
                 "appliances": adjusted_applicances_kwh
             },
-            "original": {
+            "unadjusted": {
                 "heating": heating_prediction,
                 "hot_water": hot_water_prediction,
                 "lighting": lighting_kwh,
@@ -749,7 +758,7 @@ class Property:
         }
 
         self.expected_energy_bill = (
-            adjusted_heating_cost + adjusted_hot_water_cost + adjusted_lighting_cost + appliances_energy_cost
+            adjusted_heating_cost + adjusted_hot_water_cost + adjusted_lighting_cost + adjusted_appliances_cost
         )
 
     def set_spatial(self, spatial: pd.DataFrame):