Added rng to shuffle