Adding Brian's commits.