Reorged to fix an off by 1 second error