Merge Bryan's code.