Make tokenizer arg here more like it was before