Merge with utter's changes.