Adding shuffle everywhere