Merge of Utter's code.