minor manual shuffling