Updating token gathering