reorg of the completions