Need to deal with mp weights correctly [9991826]