Added shuffle to the constructors