Alerting Improvements - Testing and Feedback Needed!