add mixing, in a separate file