revise function name
function rename
code merge
remove warning message