Improve speed and time remaining calculation