Tokens are now redrawn properly