some more reshuffling