More slight reshuffling