Library scanning much quicker