Ok - I was just preserving the original structure, but I'll do that.