diff --git a/src/dashboard_model/service.py b/src/dashboard_model/service.py
index d4901c7..fd6a85e 100644
--- a/src/dashboard_model/service.py
+++ b/src/dashboard_model/service.py
@@ -40,9 +40,9 @@ async def get_model_data(*, db_session: DbSession, simulation_id: Optional[UUID]
     availability = (main_calc_data.availability) * 100
 
     # Equivalent Forced Outage Rate (EFOR)
-    EFOR = (main_calc_data.total_cm_downtime / total_time) * 100
+    EFOR = main_calc_data.efor
 
-    EAF = (main_calc_data.availability - (main_calc_data.total_cm_downtime / total_time) - (main_calc_data.total_oh_downtime / total_time)) * 100
+    EAF = main_calc_data.eaf
 
     powerplant_reliability = {
         "Plant Control": 98,