Changed up how the flavor events are handled

Reduces the need for duplicate events