CR@VR edits for CRsb