Added computation of base velocity