add fixed mixing and some tweak