Smart recovery (29/31)

Smart recovery