replacing the API with v2