A little more shuffling/deleting