Added random-shuffle functionality