Updated with working API calls