add in event state tracking and warning