WIP ENH: Better performance