A little more optimizing.