individual optimization

Could not connect to the API.