Smart recovery (6/31)

Smart recovery