tokens are in a better state now