saver refactor