Making progress. Only re-align the tokens on final retrieval.