even more speedups