reshuffled a bit