few more template updates