changed api
merge