Slight speedup