Skeleton code v1.4.2 Fix calculateVelocity