To many API calls, this needs to be improved
To many API calls, this needs to be improved