Refactored up