Copy some template changes from previous prototype