Improving performance slightly