major template changes