Updated Alerts; Fine tuned Forever
Merge branch 'staging'