Total change to include separate logging and email