Shuffling around logic