First stage of improveing ToC