Major revision of mp-generation