Updated for MPS 3.0 final