Scan recovery (10/22)

Scan recovery