added alerts and notifications