a bit more reorg