Smart recovery (11/31)

Smart recovery