updates on the APIs
updates
fixed merge conflict