Final updates to match the Google Doc on Jun 18