Performance improvements in transition selection