Updated new template for #683.