Moved timing info out of file and into group