Moderate changes to Alerts system