add new func on branch dev
merge with branch dev