Port of new Event Mixing implementation

No match.