switch everything to v2 api