Optimize, this yields about 15% boost