Revert "Revert "template changes""

This reverts commit 970bd1b06e009a370a575e22bfdafc2d177ffdef.