working on the alerts