Added column shuffling