Changed recovery algorithms, especially - elegant