nick - template changes