Smart recovery (30/31)

Smart recovery