beginning changes to adapt to MM modifications