diff --git a/backend/Property.py b/backend/Property.py
index c1055eb9..736ab4f1 100644
--- a/backend/Property.py
+++ b/backend/Property.py
@@ -68,7 +68,7 @@ class Property(Definitions):
         self.in_conservation_area, self.is_listed, self.is_heritage = None, None, None
         self.restricted_measures = False
         self.year_built = epc_record.get("year_built")
-        self.number_of_rooms = epc_record.prepared_epc.get("number_of_rooms")
+        self.number_of_rooms = epc_record.prepared_epc["number_heated_rooms"]
         self.age_band = epc_record.get("age_band")
         self.construction_age_band = epc_record.get("construction_age_band")
         self.number_of_floors = epc_record.get("number_of_floors")
@@ -81,7 +81,7 @@ class Property(Definitions):
             "co2_emissions": epc_record.get("co2_emissions_current"),
         }
         self.ventilation = {
-            "ventilation": epc_record.get("mechanical_ventilation"),
+            "ventilation": epc_record.prepared_epc["mechanical_ventilation"],
         }
         self.solar_pv = {
             "solar_pv": epc_record.get("photo_supply"),
@@ -90,28 +90,28 @@ class Property(Definitions):
             "solar_hot_water": epc_record.get("solar_water_heating_flag"),
         }
         self.wind_turbine = {
-            "wind_turbine": epc_record.prepared_epc.get("wind_turbine_count"),
+            "wind_turbine": epc_record.prepared_epc["wind_turbine_count"],
         }
         self.number_of_open_fireplaces = {
-            "number_of_open_fireplaces": epc_record.prepared_epc.get("number_of_open_fireplaces"),
+            "number_of_open_fireplaces": epc_record.prepared_epc["number_open_fireplaces"],
         }
         self.number_of_extensions = {
-            "number_of_extensions": epc_record.prepared_epc.get("number_of_extensions"),
+            "number_of_extensions": epc_record.prepared_epc["extension_count"],
         }
         self.number_of_storeys = {
-            "number_of_storeys": epc_record.prepared_epc.get("number_of_storeys"),
+            "number_of_storeys": epc_record.prepared_epc["flat_storey_count"],
         }
         self.heat_loss_corridor = {
-            "heat_loss_corridor": epc_record.prepared_epc.get("heat_loss_corridor"),
-            "length": epc_record.prepared_epc.get("unheated_corridor_length"),
+            "heat_loss_corridor": epc_record.prepared_epc["heat_loss_corridor"],
+            "length": epc_record.prepared_epc["unheated_corridor_length"],
         }
-        self.mains_gas = epc_record.prepared_epc.get('mains_gas_flag')
-        self.floor_height = epc_record.prepared_epc.get('floor_height')
+        self.mains_gas = epc_record.prepared_epc['mains_gas_flag']
+        self.floor_height = epc_record.prepared_epc['floor_height']
         self.insulation_wall_area = None
         self.floor_area = epc_record.prepared_epc.get('total_floor_area')
         self.pitched_roof_area = None
         self.insulation_floor_area = None
-        self.number_lighting_outlets = epc_record.prepared_epc.get("fixed_lighting_outlets_count")
+        self.number_lighting_outlets = epc_record.prepared_epc["fixed_lighting_outlets_count"]
         self.floor_level = None
         self.number_of_windows = None
         self.solar_pv_roof_area = None
diff --git a/backend/app/plan/router.py b/backend/app/plan/router.py
index 39944fe3..6e9c4f50 100644
--- a/backend/app/plan/router.py
+++ b/backend/app/plan/router.py
@@ -159,6 +159,8 @@ async def trigger_plan(body: PlanTriggerRequest):
             recommender = Recommendations(property_instance=p, materials=materials)
             property_recommendations = recommender.recommend()
 
+            recommender.wall_recomender.estimated_u_value
+
             if not property_recommendations:
                 continue