ENH: Speeding up