Added some changes to alerts