made things faster by having token know its zone instead of searching for it all the time
hopefully does not break anything