added new alerts mechanism