Merge in Stephen's changes.