Adding check for actual_velocity