RR's changes for video recording included