new function 1
new function update 1
function update 2
merge old function
merge old function update