Prior to refactoring