Adjusted event conditional logic