ENH: Much faster