revised base templates