Added in +/- 30 second controls.  With catches to stay within the time limits of the data.