Updated Alert System Functionality