Improved performance of scanlist dramatically