Added shuffle everywhere.