Smart recovery (5/31)

Smart recovery