Smart recovery (7/31)

Smart recovery