Optimized, 1.7X Faster than previous