updated to pick up mp/ma fields from images