Added shuffle and shuffled