updated for 3.8-tree