diff --git a/src/aeros_simulation/router.py b/src/aeros_simulation/router.py
index 66ea160..4915832 100644
--- a/src/aeros_simulation/router.py
+++ b/src/aeros_simulation/router.py
@@ -323,21 +323,24 @@ async def get_custom_parameters_controller(db_session: DbSession, simulation_id:
         "message": "Simulation result retrieved successfully",
     }
 
-@router.get("/ahm_metrics/{simulation_id}", response_model=StandardResponse[list])
+@router.post("/ahm_metrics", response_model=StandardResponse[dict])
 async def get_ahm_metrics_controller(db_session: DbSession, simulation_id:UUID):
     simulation_result = await get_plant_calc_result(
         db_session=db_session, simulation_id=simulation_id
     )
     
     default_simulation = await get_default_simulation(db_session=db_session)
+    default_simulation_result = await get_plant_calc_result(
+        db_session=db_session, simulation_id=default_simulation.id
+    )
     
     result = {
-        "eaf_before": default_simulation.eaf,
+        "eaf_before": default_simulation_result.eaf,
         "eaf_after": simulation_result.eaf,
-        "efor_before": default_simulation.efor,
+        "efor_before": default_simulation_result.efor,
         "efor_after": simulation_result.efor,
-        "eaf_delta": simulation_result.eaf - default_simulation.eaf,
-        "efor_delta": simulation_result.efor - default_simulation.efor,
+        "eaf_delta": simulation_result.eaf - default_simulation_result.eaf,
+        "efor_delta": simulation_result.efor - default_simulation_result.efor,
     }