fixing the MH v2 pt2 further