Scan recovery (4/22)

Scan recovery