codetemplate minor modifications
codetemplate minor modifications