updated base templates