Further Optimizations.