Changes to MM and messages