updated with api v2