smultron: changes for recovery