new changes with mailer