updated for mailer