new TOC and lots of refinements