another 1.65x speedup (about 11x speedup with both patches)