Merging in Brian's changes partially