cleaned up UpdateScan