more work on alerts