You absolutely CAN use the same person/firm for Fundamental and Enhanced Cx. That only makes sense. We do that on every project. The rule is that for Enhanced Cx the person/firm can not be a member of the design team. They have to be independent, third-party.