Improving performance quite a bit