Merge "add function of update"