small reorg, using doc ready
reverting to rebekah's