Major restructuring to incremental scanning.