added funcs
merge