upgrade to API v2