Refactor
Refactor
Fix the regression of delayed alerts