More efficient random data selection, no unit test yet