remove and add additional templates