simplify
add toc