Add comments and StopScan method