Modified on how email is sent