more template upgrades