second proposal to do it, still missing 2e toc