updated for alerts