Added some mixing and tweaked grid