ENH: 3-order magnitude performance bump