added alerts and comments