Refactored head