updated toc-handler