Selection: Refactor to fire events on same turn