adaptation and retrofitting

Could not connect to the API.