Refactored Sun