Another small speed improvement?