Further changes, based on Reid and Sachin discussion.