Updates based on review Oct 20 review meeting.