Further speedup