various template changes