diff --git a/etl/customers/aiha/xml_extraction.py b/etl/customers/aiha/xml_extraction.py
index 25917f1e..8c5c9008 100644
--- a/etl/customers/aiha/xml_extraction.py
+++ b/etl/customers/aiha/xml_extraction.py
@@ -578,6 +578,44 @@ def main():
                     "ending_sap": 70,
                 }
             ]
+        },
+        {
+            "survey_key": "AIH001-17",
+            "starting_sap": 62,
+            "recommended_measures": [
+                {
+                    "measure": "Cylinder Insulation",
+                    "description": "80mm cylinder insulation",
+                    "sap_points": 1,
+                    "ending_sap": 63,
+                },
+                {
+                    "measure": "TTZC",
+                    "description": "Smart Thermostat",
+                    "sap_points": 3,
+                    "ending_sap": 66,
+                },
+                {
+                    "measure": "Solar PV",
+                    "description": "4kWp Solar PV system",
+                    "config": [
+                        {
+                            "size": "3.2kW",
+                            "orientation": "East",
+                            "elavation": 30,
+                            "overshading": "None or little",
+                        },
+                        {
+                            "size": "0.8kW",
+                            "orientation": "West",
+                            "elavation": 30,
+                            "overshading": "None or little",
+                        }
+                    ],
+                    "sap_points": 12,
+                    "ending_sap": 78,
+                }
+            ]
         }
     ]
 
diff --git a/etl/customers/stonewater/Wave 3 Preparation.py b/etl/customers/stonewater/Wave 3 Preparation.py
index 477a73c8..9f929db1 100644
--- a/etl/customers/stonewater/Wave 3 Preparation.py	
+++ b/etl/customers/stonewater/Wave 3 Preparation.py	
@@ -458,9 +458,6 @@ def extract_building_parts_summary(text):
     return dimensions
 
 
-import re
-
-
 def extract_roof_details_epr(text):
     """
     Extracts roof type, insulation, and insulation thickness for each building part
@@ -1158,7 +1155,7 @@ def main():
 
     create_proposed_wave_3_bid(
         costed_packages_filepath=os.path.join(
-            CUSTOMER_FOLDER_PATH, "Stonewater - Costed Retrofit Packages 20241030 (WIP) V2.xlsx"
+            CUSTOMER_FOLDER_PATH, "Stonewater - Costed Retrofit Packages 20241030 (WIP) MR Review v1.xlsx"
         ),
         archetypes_sheet_filepath=os.path.join(
             CUSTOMER_FOLDER_PATH, "Stonewater SHDF_3_0_Board Triage 22.05.24 - Archetyped V3.1.xlsx"
@@ -1168,7 +1165,8 @@ def main():
 
 def create_proposed_wave_3_bid(costed_packages_filepath, archetypes_sheet_filepath):
     # We read in the costed packages
-    costed_packages = pd.read_excel(costed_packages_filepath)
+    # Note: Header as 12 is for Matt Ratcliff's reviewed version
+    costed_packages = pd.read_excel(costed_packages_filepath, header=13, sheet_name="Modelled Packages")
 
     archetypes_to_cost = costed_packages[
         [