More refactoring.
More changes
More changes