Further 14% speedup