Rewrote logic for the dropped flag event