Attempt to optimize API calls, no success.