Reflected changes from part 1 around templates here