I wonder if it would be better to combine these two events, since they are essentially the same thing?