improved templates;