Fix regression with distance and efficiency calc