Sync with CM's tree