reworked templates to reflect natural dates