Update tokens, see #2