Merge in Brian's updates