Added max velocity for tracking