Changed shuffle to return the individual elements instead of gathering to a list.