Added shuffle option