Made the capture system more friendly, by capturing at the frame level rather than panel