Progress, tracking down bug in updating tokens to a shorter span than before.