Trying a different approach to orphaning fix

Trying a different approach to orphaning fix