Wih ScanActivity change