Updated alerts
Merged