adding back in flag to turn off email