Fixes to new time estimation method