Smart recovery (8/31)

Smart recovery