overhaul to the alert service