merge of Xi's edit