updated template
merged