Changed the email alert stuff