no optimization worked to speed up the parsing, backing up a little modif