diff --git a/app/eva_common.py b/app/eva_common.py
index d774286..f8c668d 100644
--- a/app/eva_common.py
+++ b/app/eva_common.py
@@ -840,24 +840,24 @@ def calc_service_level(delay_time, stop_times):
         service_level = 'A'
     elif 10 < delay_time <= 20:
         service_level = 'B'
-        # if stop_times < 0.25:
-        #     service_level = 'A'
+        if stop_times < 0.4:
+            service_level = 'A'
     elif 20 < delay_time <= 35:
         service_level = 'C'
-        # if stop_times < 0.4:
-        #     service_level = 'B'
+        if stop_times < 0.6:
+            service_level = 'B'
     elif 35 < delay_time <= 55:
         service_level = 'D'
-        # if stop_times < 0.5:
-        #     service_level = 'C'
+        if stop_times < 0.7:
+            service_level = 'C'
     elif 55 < delay_time <= 80:
         service_level = 'E'
-        # if stop_times < 0.65:
-        #     service_level = 'D'
+        if stop_times < 0.9:
+            service_level = 'D'
     else:
         service_level = 'F'
-        # if stop_times < 0.8:
-        #     service_level = 'E'
+        if stop_times < 1.2:
+            service_level = 'E'
     return service_level