Add Shuffle
Add Random number generator