for previous refactoring.