Continuing at add q2-vr changes