added support for recovering