Added API
fixed merge conflicts