Big Update: Finish Scan