more template enhancement