progress on token switches