Updated from discussion.