Update from Salvatore to have time recalib working in the tender. Here is the logic: