added templates
Merge