Merge Brian's changes