Improvements to the TOC