replace the template

i have merged your changes