Some minor shuffling