Made alerts better