update for API v2.1