New version with velocity calculations.