Adding final touches to the timing