Speedup

10x tests speedup.