Changes for pragma in av_velocity