Added "shuffle" and "repeat"