refactored video order