tweak to templates