Reduce api calls?? not yet but soon