Changes for new version of template