Simplify and fix recovery