more shuffling around