for api 1.1
merge with pr