updating for mapping changes
updating email templates