more template changes