Fixed original bug. Still using Baishen’s shuffle