added conditions for alert calls/ comments