more updates related to MPS 3.0