improvements on TOC