Another speedup