Reworking templates