refactored dailymotion