Refactored HQ