Improved performance a bit