Merge of Zee's stuff