1) Flattening is no more needed
2) Tokenizer