More changes to scan