begin fixing the shuffling