Use Ints instead of Longs in the shuffle