Better handling of the time updates