Tmp commit. Optimizations.