Update to API, comments