ok, I gather the above is at the crux of the change? could probably use inline commenting, given the complexity.