Optimized some more.
Optimized some more.