Added .toc and buffer