update from Mark's reorg