upgrade to APIV2