sync with thomas-mangin tree