some more template changes