economic refactoring

Could not connect to the API.