Added repeat and shuffle features.