Design: Shuffle with history