This should improve performance a bit.