Further pace calc updates