starting to change for api v2