Made est time left more reliable