Shrinking NTZ/Dynamic MPAs code