Rebuilt recovery flow