Use shuffle correctly