further template changes