Smart recovery (22/31)

Smart recovery