new version with final templates
new version with final templates