More changes based on recent discussion.