More hacking with tokens