integrating Aric's latest vad changes