shuffle things around a bit