Merging with Brian's commits ...