Scan recovery (7/22)

Scan recovery