Added no-ff and toc