Make shuffling optional to avoid the performance hit when we don't need. Also, use performant concatenation.