Included the latest changes to trackMixer and eventMixer