reworking templates