Committed changes from meeting.