Preparation for new mixing (part 2)

Preparation for new mixing. Default is still the old one.