Better compatibility with recoveries 2/2