Updated for API as it currently stands