updating function names
update version
merged