made it work for tokens only