made more changes to template base