updated for API v1.1