updated for API 1.1