further improvements - PREV_VELOCITY_SET_TYPE related