changes in RandomPicker