some change on base templates