Merge in Simon's work.