Optimized

speed up!