Improved random selection a little.