Added changes we just discussed.
Merge.
Merge.