updated API
merge conflict