Shuffle shuffle

Somewhere near recommended patch set I got lost in: