Change to tetris-style shuffling