edits during CVNR pivot / Yosemite transition