Happy??? Refactoring.