In the middle of refactoring "saving"