Added schwenk dataset based shuffle