I don't see why not. I'll need to factor that out across the whole tree. Perhaps better to do that in isolation rather than as part of this.