Added some more alerts