MCV now working. Much faster with far fewer assignments.