Added individual shuffle option