change token retrieval