changes corresponding to last review by mike