Master refactored.