Added randomness to shuffle methods