newest version of code [1404]
restore mcv additions [1404]