Moved changes in from Brandon.