minor changes to check the different shuffle strategies