switching to NewTableWithLeaf()