modified for mail