Updated tokenizer, runs in 4 hours