updated for email template changes