Refactored header to merge header