James C - better reorg