Updated with Krishna's doc tweaks