Sync with Edward's tree.