try to improve performance using the new tokenize flavour