Speedup

speed up changes