change to new tokens