input name modified
Merge branch 'charith_new'