Improved performance a little.