1862 refactor data recovery tutorial take 2