more reorg of endings