updated parser for toc2 and toc3