Moves this to use copy of toc with updates