Update by josh for the API.