shuffling some things around