Add alerting
Merge fix for alerting
Better check for alerting
Merge extra alerting