MU2 modification(part 2) as per Brady's code review.