reorg based on Doug review