Better speed calculation