prep for updated tokens retrievals