Added better alerts