Significant improvements to timing subproject.