Updated with new alerts