xmsp changes.