diff --git a/ORBIT/phases/design/electrical_export.py b/ORBIT/phases/design/electrical_export.py
index 60414528..d485a50f 100644
--- a/ORBIT/phases/design/electrical_export.py
+++ b/ORBIT/phases/design/electrical_export.py
@@ -436,29 +436,21 @@ def calc_substructure_mass_and_cost(self):
         oss_substructure_cost_rate : int | float
         oss_pile_cost_rate : int | float
         """
+        
         _design = self.config.get("substation_design", {})
         substructure_mass = 0.4 * self.topside_mass
-        if self.cable.cable_type == "HVDC-monopole":
-            self.substructure_cost = _design.get(
-                "oss_substructure_cost_rate", 294e6
-            )
-        elif self.cable.cable_type == "HVDC-bipole":
-            self.substructure_cost = _design.get(
-                "oss_substructure_cost_rate", 476e6
-            )
-        else:
-            self.substructure_cost = _design.get(
-                "oss_substructure_cost_rate", 107.3e6
-            )
-            # oss_pile_cost_rate = _design.get("oss_pile_cost_rate", 0)
-            # substructure_pile_mass = 8 * substructure_mass**0.5574
-            # self.substructure_cost = (77.8
-            #     substructure_mass * oss_substructure_cost_rate
-            #     + substructure_pile_mass * oss_pile_cost_rate
-            # )
-
-            # self.substructure_mass = substructure_mass + substructure_pile_mass
-        self.substructure_mass = substructure_mass
+        oss_pile_cost_rate = _design.get("oss_pile_cost_rate", 0)
+        oss_substructure_cost_rate = _design.get(
+            "oss_substructure_cost_rate", 3000
+        )
+        
+        substructure_pile_mass = 8 * substructure_mass**0.5574
+        self.substructure_cost = (
+                substructure_mass * oss_substructure_cost_rate
+                + substructure_pile_mass * oss_pile_cost_rate
+        )
+        
+        self.substructure_mass = substructure_mass + substructure_pile_mass
 
 
     def calc_substructure_length(self):
@@ -497,16 +489,25 @@ def calc_topside_mass_and_cost(self):
         """
 
         _design = self.config.get("substation_design", {})
-        topside_fab_cost_rate = _design.get("topside_fab_cost_rate", 14500)
-        topside_design_cost = _design.get("topside_design_cost", 4.5e6)
+        #topside_fab_cost_rate = _design.get("topside_fab_cost_rate", 14500)
+        #topside_design_cost = _design.get("topside_design_cost", 4.5e6)
 
         self.topside_mass = (
             3.85 * (self.mpt_rating * self.num_mpt) / self.num_substations
             + 285
         )
-        self.topside_cost = (
-            self.topside_mass * topside_fab_cost_rate + topside_design_cost
-        )
+        if self.cable.cable_type == "HVDC-monopole":
+            self.topside_cost = _design.get(
+                "topside_design_cost", 294e6
+            )
+        elif self.cable.cable_type == "HVDC-bipole":
+            self.topside_cost = _design.get(
+                "topside_design_cost", 476e6
+            )
+        else:
+            self.topside_cost = _design.get(
+                "topside_design_cost", 107.3e6
+            )
 
     def calc_onshore_cost(self):
         """Minimum Cost of Onshore Substation Connection"""
@@ -531,7 +532,7 @@ def calc_onshore_cost(self):
             self.onshore_converter_cost = 0
             self.ais_cost = self.num_cables * 9.33e6
             self.onshore_compensation = self.num_cables * (31.3e6 + 8.66e6)
-            self.onshore_construction = 0
+            self.onshore_construction = 5e6 * self.num_substations
 
         self.onshore_cost = (
             self.onshore_converter_cost
diff --git a/library/cables/HVDC_2500mm_525kV.yaml b/library/cables/HVDC_2500mm_525kV.yaml
index 0c9eb507..f5f9c60c 100644
--- a/library/cables/HVDC_2500mm_525kV.yaml
+++ b/library/cables/HVDC_2500mm_525kV.yaml
@@ -2,7 +2,7 @@
 ac_resistance: 0           # ohm/km
 capacitance: 227000        # nF/km
 conductor_size: 2500       # mm^2
-cost_per_km: 1380000       # $ 825k
+cost_per_km: 1420000       # $ 825k
 current_capacity: 1905     # A
 inductance: 0.149          # mH/km
 linear_density: 74         # t/km
diff --git a/library/cables/XLPE_1000m_220kV.yaml b/library/cables/XLPE_1000m_220kV.yaml
index e0019021..df8ac888 100644
--- a/library/cables/XLPE_1000m_220kV.yaml
+++ b/library/cables/XLPE_1000m_220kV.yaml
@@ -1,7 +1,7 @@
 ac_resistance: 0.16        # ohm/km
 capacitance: 190           # nF/km
 conductor_size: 1000       # mm^2
-cost_per_km: 1350000        # $ 850k
+cost_per_km: 1420000        # $ 850k
 current_capacity: 825      # A
 inductance: 0.38           # mH/km
 linear_density: 115        # t/km