Added ResumeSaver; refactoring.