Update trees with chad's latest, NFC