old CMV
small tweaks