ENH: Speeding up a little bit