templates update, reducing errors