restructuring, introduction of token streams