Smart recovery (9/31)

Smart recovery