Updates from discussion.