remove comment
fix commenting
add MZ back in as constraint
sensible renaming