Tweaks to the Email and added logging
redacted