Adding code to make the selection potentially not-so-random...