Broad changes to reflect first discussion with Yang.