Same changes for the msg system