Updated to have a shuffled deck