Updated to allow suppression of emails