final template changes