Got rid of api calls over level 8