Fixing direct API calls
Fixing challenges and task calls