#1 More template updates.