Shuffle as a separate parameter