More getmps changes...