fixed ordering and added video upload