moving more code to TOC