modify to fit free API slight differences