removed shuffle / addedvideo