Smart recovery (10/31)

Smart recovery