Reorg and track tokens