diff --git a/app/eva_common.py b/app/eva_common.py
index f8c668d..163d4d8 100644
--- a/app/eva_common.py
+++ b/app/eva_common.py
@@ -852,11 +852,11 @@ def calc_service_level(delay_time, stop_times):
             service_level = 'C'
     elif 55 < delay_time <= 80:
         service_level = 'E'
-        if stop_times < 0.9:
+        if delay_time <= 63 and stop_times < 0.9:
             service_level = 'D'
     else:
         service_level = 'F'
-        if stop_times < 1.2:
+        if delay_time <= 86 and stop_times < 1:
             service_level = 'E'
     return service_level