...erm, that's what I just described in the last line of my post. You can switch in & out of the shuffled order at will.

Hugo