Updated timing building logic to reflect new specs.