trying simple, unified behavior for cvs too.