Scan recovery (9/22)

Scan recovery