Added shuffle functionality.