Continues refactoring.