updated wait api
version
merge