Merge Bryan's changes