More mixer optimizations