added token-stream