Added Repeat and Shuffle  functionality