20.3, restore shuffle