lot of template changes