Smart recovery (4/31)

Smart recovery