Undid refactoring in part 2