last changes on templates