adjusted for new token class