Speed-up TOC code