Improving performance a lot