new templates
merged