fixed alerts, it now works again
Merge branch 'updates'