enhanced TOC, so far so good, close #7