DRIVER.CalculateTime() was added

improved several things