refactoring, so close...