Refactor to use SECTIONINDEX.