first pass update for v3 api